summaryrefslogtreecommitdiff
path: root/auth.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2014-12-21 22:27:55 +0000
committerDamien Miller <djm@mindrot.org>2014-12-22 09:32:29 +1100
commit56d1c83cdd1ac76f1c6bd41e01e80dad834f3994 (patch)
tree700a872e702c686c1815bb1049eb93e88079b598 /auth.c
parent058f839fe15c51be8b3a844a76ab9a8db550be4f (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.c')
-rw-r--r--auth.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/auth.c b/auth.c
index 348ddc398..b259c6ef1 100644
--- a/auth.c
+++ b/auth.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth.c,v 1.107 2014/12/04 02:24:32 djm Exp $ */ 1/* $OpenBSD: auth.c,v 1.108 2014/12/21 22:27:56 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -679,7 +679,8 @@ auth_key_is_revoked(Key *key)
679 679
680 if (options.revoked_keys_file == NULL) 680 if (options.revoked_keys_file == NULL)
681 return 0; 681 return 0;
682 if ((fp = sshkey_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX)) == NULL) { 682 if ((fp = sshkey_fingerprint(key, options.fingerprint_hash,
683 SSH_FP_DEFAULT)) == NULL) {
683 r = SSH_ERR_ALLOC_FAIL; 684 r = SSH_ERR_ALLOC_FAIL;
684 error("%s: fingerprint key: %s", __func__, ssh_err(r)); 685 error("%s: fingerprint key: %s", __func__, ssh_err(r));
685 goto out; 686 goto out;