diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2013-01-09 05:40:18 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2013-01-09 05:40:18 +0000 |
| commit | 347415724e4c053b4c234dea3fdf849ec7fc47a5 (patch) | |
| tree | 3fea952e691febd3b78b1845795a7346ea4d8710 /usr.bin | |
| parent | 62aaa30436012aba34d79cfa57c7292f48baa085 (diff) | |
correctly initialise fingerprint type for fingerprinting PKCS#11 keys
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/ssh-keygen.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c index f1feb5bc05b..2ef00d0636b 100644 --- a/usr.bin/ssh/ssh-keygen.c +++ b/usr.bin/ssh/ssh-keygen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keygen.c,v 1.221 2013/01/03 23:22:58 djm Exp $ */ +/* $OpenBSD: ssh-keygen.c,v 1.222 2013/01/09 05:40:17 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -714,6 +714,9 @@ do_download(struct passwd *pw) enum fp_type fptype; char *fp, *ra; + fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5; + rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX; + pkcs11_init(0); nkeys = pkcs11_add_provider(pkcs11provider, NULL, &keys); if (nkeys <= 0) |