summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/auth-rsa.c
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2014-12-21 22:27:57 +0000
committerDamien Miller <djm@cvs.openbsd.org>2014-12-21 22:27:57 +0000
commit1c51eb7d62646ac1f70515eafa05d50a9a419264 (patch)
tree9a56475bf50fed05ed0220025cddeb2cf6a949e7 /usr.bin/ssh/auth-rsa.c
parent69181e6a1235c008e9881ced488348b93a269b9d (diff)
Add FingerprintHash option to control algorithm used for key
fingerprints. Default changes from MD5 to SHA256 and format from hex to base64. Feedback and ok naddy@ markus@
Diffstat (limited to 'usr.bin/ssh/auth-rsa.c')
-rw-r--r--usr.bin/ssh/auth-rsa.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/auth-rsa.c b/usr.bin/ssh/auth-rsa.c
index d736d5a3231..76546b85bd6 100644
--- a/usr.bin/ssh/auth-rsa.c
+++ b/usr.bin/ssh/auth-rsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth-rsa.c,v 1.88 2014/07/15 15:54:14 millert Exp $ */
+/* $OpenBSD: auth-rsa.c,v 1.89 2014/12/21 22:27:56 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -233,7 +233,8 @@ rsa_key_allowed_in_file(struct passwd *pw, char *file,
"actual %d vs. announced %d.",
file, linenum, BN_num_bits(key->rsa->n), bits);
- fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX);
+ fp = key_fingerprint(key, options.fingerprint_hash,
+ SSH_FP_DEFAULT);
debug("matching key found: file %s, line %lu %s %s",
file, linenum, key_type(key), fp);
free(fp);