diff options
author | djm@openbsd.org <djm@openbsd.org> | 2014-12-21 22:27:55 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-12-22 09:32:29 +1100 |
commit | 56d1c83cdd1ac76f1c6bd41e01e80dad834f3994 (patch) | |
tree | 700a872e702c686c1815bb1049eb93e88079b598 /auth-rsa.c | |
parent | 058f839fe15c51be8b3a844a76ab9a8db550be4f (diff) |
upstream commit
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 'auth-rsa.c')
-rw-r--r-- | auth-rsa.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/auth-rsa.c b/auth-rsa.c index e9f4ede26..ff7a13221 100644 --- a/auth-rsa.c +++ b/auth-rsa.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth-rsa.c,v 1.88 2014/07/15 15:54:14 millert Exp $ */ | 1 | /* $OpenBSD: auth-rsa.c,v 1.89 2014/12/21 22:27:56 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -236,7 +236,8 @@ rsa_key_allowed_in_file(struct passwd *pw, char *file, | |||
236 | "actual %d vs. announced %d.", | 236 | "actual %d vs. announced %d.", |
237 | file, linenum, BN_num_bits(key->rsa->n), bits); | 237 | file, linenum, BN_num_bits(key->rsa->n), bits); |
238 | 238 | ||
239 | fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX); | 239 | fp = key_fingerprint(key, options.fingerprint_hash, |
240 | SSH_FP_DEFAULT); | ||
240 | debug("matching key found: file %s, line %lu %s %s", | 241 | debug("matching key found: file %s, line %lu %s %s", |
241 | file, linenum, key_type(key), fp); | 242 | file, linenum, key_type(key), fp); |
242 | free(fp); | 243 | free(fp); |