summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--ssh-keygen.c5
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 868158cfc..37f114b5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,6 +37,9 @@
37 [myproposal.h packet.c ssh_config.5 sshd_config.5] 37 [myproposal.h packet.c ssh_config.5 sshd_config.5]
38 support AES-GCM as defined in RFC 5647 (but with simpler KEX handling) 38 support AES-GCM as defined in RFC 5647 (but with simpler KEX handling)
39 ok and feedback djm@ 39 ok and feedback djm@
40 - djm@cvs.openbsd.org 2013/01/09 05:40:17
41 [ssh-keygen.c]
42 correctly initialise fingerprint type for fingerprinting PKCS#11 keys
40 - (djm) [cipher.c configure.ac openbsd-compat/openssl-compat.h] 43 - (djm) [cipher.c configure.ac openbsd-compat/openssl-compat.h]
41 Fix merge botch, automatically detect AES-GCM in OpenSSL, move a little 44 Fix merge botch, automatically detect AES-GCM in OpenSSL, move a little
42 cipher compat code to openssl-compat.h 45 cipher compat code to openssl-compat.h
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 106f1536d..a19a2b085 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keygen.c,v 1.221 2013/01/03 23:22:58 djm Exp $ */ 1/* $OpenBSD: ssh-keygen.c,v 1.222 2013/01/09 05:40:17 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -727,6 +727,9 @@ do_download(struct passwd *pw)
727 enum fp_type fptype; 727 enum fp_type fptype;
728 char *fp, *ra; 728 char *fp, *ra;
729 729
730 fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5;
731 rep = print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX;
732
730 pkcs11_init(0); 733 pkcs11_init(0);
731 nkeys = pkcs11_add_provider(pkcs11provider, NULL, &keys); 734 nkeys = pkcs11_add_provider(pkcs11provider, NULL, &keys);
732 if (nkeys <= 0) 735 if (nkeys <= 0)