tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 07:44:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2013/01/03 23:22:58

Browse Source 
[ssh-keygen.c]
     allow fingerprinting of keys hosted in PKCS#11 tokens: ssh-keygen -lD ...
     ok markus@
This commit is contained in:
Damien Miller 2013-01-09 15:58:00 +11:00
parent 502ab0eff1
commit ec77c954c8
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -23,6 +23,10 @@
[sftp-server.8 sftp-server.c] [sftp-server.8 sftp-server.c]
allow specification of an alternate start directory for sftp-server(8) allow specification of an alternate start directory for sftp-server(8)
"I like this" markus@ "I like this" markus@
- djm@cvs.openbsd.org 2013/01/03 23:22:58
[ssh-keygen.c]
allow fingerprinting of keys hosted in PKCS#11 tokens: ssh-keygen -lD ...
ok markus@
20121217 20121217
- (dtucker) [Makefile.in] Add some scaffolding so that the new regress - (dtucker) [Makefile.in] Add some scaffolding so that the new regress

25
ssh-keygen.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-keygen.c,v 1.220 2012/12/03 00:14:06 djm Exp $ */ /* $OpenBSD: ssh-keygen.c,v 1.221 2013/01/03 23:22:58 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -723,16 +723,31 @@ do_download(struct passwd *pw)
#ifdef ENABLE_PKCS11 #ifdef ENABLE_PKCS11
Key **keys = NULL; Key **keys = NULL;
int i, nkeys; int i, nkeys;
enum fp_rep rep;
enum fp_type fptype;
char *fp, *ra;
pkcs11_init(0); pkcs11_init(0);
nkeys = pkcs11_add_provider(pkcs11provider, NULL, &keys); nkeys = pkcs11_add_provider(pkcs11provider, NULL, &keys);
if (nkeys <= 0) if (nkeys <= 0)
fatal("cannot read public key from pkcs11"); fatal("cannot read public key from pkcs11");
for (i = 0; i < nkeys; i++) { for (i = 0; i < nkeys; i++) {
if (print_fingerprint) {
fp = key_fingerprint(keys[i], fptype, rep);
ra = key_fingerprint(keys[i], SSH_FP_MD5,
SSH_FP_RANDOMART);
printf("%u %s %s (PKCS11 key)\n", key_size(keys[i]),
fp, key_type(keys[i]));
if (log_level >= SYSLOG_LEVEL_VERBOSE)
printf("%s\n", ra);
xfree(ra);
xfree(fp);
} else {
key_write(keys[i], stdout); key_write(keys[i], stdout);
key_free(keys[i]);
fprintf(stdout, "\n"); fprintf(stdout, "\n");
} }
key_free(keys[i]);
}
xfree(keys); xfree(keys);
pkcs11_terminate(); pkcs11_terminate();
exit(0); exit(0);
@ -2177,7 +2192,7 @@ main(int argc, char **argv)
usage(); usage();
} }
if (print_fingerprint && (delete_host || hash_hosts)) { if (print_fingerprint && (delete_host || hash_hosts)) {
printf("Cannot use -l with -D or -R.\n"); printf("Cannot use -l with -H or -R.\n");
usage(); usage();
} }
if (ca_key_path != NULL) { if (ca_key_path != NULL) {
@ -2189,6 +2204,8 @@ main(int argc, char **argv)
do_show_cert(pw); do_show_cert(pw);
if (delete_host || hash_hosts || find_host) if (delete_host || hash_hosts || find_host)
do_known_hosts(pw, rr_hostname); do_known_hosts(pw, rr_hostname);
if (pkcs11provider != NULL)
do_download(pw);
if (print_fingerprint || print_bubblebabble) if (print_fingerprint || print_bubblebabble)
do_fingerprint(pw); do_fingerprint(pw);
if (change_passphrase) if (change_passphrase)
@ -2226,8 +2243,6 @@ main(int argc, char **argv)
exit(0); exit(0);
} }
} }
if (pkcs11provider != NULL)
do_download(pw);
if (do_gen_candidates) { if (do_gen_candidates) {
FILE *out = fopen(out_file, "w"); FILE *out = fopen(out_file, "w");