RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-27 12:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2013/01/09 05:40:17

Browse Source 
[ssh-keygen.c]
     correctly initialise fingerprint type for fingerprinting PKCS#11 keys
This commit is contained in:
Damien Miller 2013-01-09 16:44:54 +11:00
parent d522c68872
commit 1422c0887c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -37,6 +37,9 @@
[myproposal.h packet.c ssh_config.5 sshd_config.5]
support AES-GCM as defined in RFC 5647 (but with simpler KEX handling)
ok and feedback djm@
- djm@cvs.openbsd.org 2013/01/09 05:40:17
[ssh-keygen.c]
correctly initialise fingerprint type for fingerprinting PKCS#11 keys
- (djm) [cipher.c configure.ac openbsd-compat/openssl-compat.h]
Fix merge botch, automatically detect AES-GCM in OpenSSL, move a little
cipher compat code to openssl-compat.h

5
ssh-keygen.c
View File

@ -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
@ -727,6 +727,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)