Attachment #326 for bug #591

Lines 554-557 Link Here

(-)scard.c (+7 lines)
554	sectok_close(fd);	554	sectok_close(fd);
555	return (status);	555	return (status);
556	}	556	}
		557
		558	char *
		559	sc_get_key_label(Key *key)
		560	{
		561	return xstrdup("smartcard key");
		562	}
		563
557	#endif /* SMARTCARD */	564	#endif /* SMARTCARD */

Lines 36-40 Link Here

(-)scard.h (+1 lines)
36	Key *sc_get_keys(const char , const char *);	36	Key *sc_get_keys(const char , const char *);
37	void sc_close(void);	37	void sc_close(void);
38	int sc_put_key(Key , const char );	38	int sc_put_key(Key , const char );
		39	char sc_get_key_label(Key );
39		40
40	#endif	41	#endif

Lines 614-620 Link Here

(-)ssh-agent.c (-1 / +1 lines)
614	if (lookup_identity(k, version) == NULL) {	614	if (lookup_identity(k, version) == NULL) {
615	id = xmalloc(sizeof(Identity));	615	id = xmalloc(sizeof(Identity));
616	id->key = k;	616	id->key = k;
617	id->comment = xstrdup("smartcard key");	617	id->comment = sc_get_key_label(k);
618	id->death = death;	618	id->death = death;
619	id->confirm = confirm;	619	id->confirm = confirm;
620	TAILQ_INSERT_TAIL(&tab->idlist, id, next);	620	TAILQ_INSERT_TAIL(&tab->idlist, id, next);

Lines 1160-1166 Link Here

(-)ssh.c (-1 / +1 lines)
1160	sizeof(Key ) (SSH_MAX_IDENTITY_FILES - 1));	1160	sizeof(Key ) (SSH_MAX_IDENTITY_FILES - 1));
1161	options.num_identity_files++;	1161	options.num_identity_files++;
1162	options.identity_keys[0] = keys[i];	1162	options.identity_keys[0] = keys[i];
1163	options.identity_files[0] = xstrdup("smartcard key");;	1163	options.identity_files[0] = sc_get_key_label(keys[i]);
1164	}	1164	}
1165	if (options.num_identity_files > SSH_MAX_IDENTITY_FILES)	1165	if (options.num_identity_files > SSH_MAX_IDENTITY_FILES)
1166	options.num_identity_files = SSH_MAX_IDENTITY_FILES;	1166	options.num_identity_files = SSH_MAX_IDENTITY_FILES;

Return to bug 591