diff options
Diffstat (limited to 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/sshconnect.c b/sshconnect.c index 4b9681a5b..176a20a87 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect.c,v 1.253 2014/12/11 08:20:09 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect.c,v 1.254 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 |
@@ -918,9 +918,10 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port, | |||
918 | "key for IP address '%.128s' to the list " | 918 | "key for IP address '%.128s' to the list " |
919 | "of known hosts.", type, ip); | 919 | "of known hosts.", type, ip); |
920 | } else if (options.visual_host_key) { | 920 | } else if (options.visual_host_key) { |
921 | fp = key_fingerprint(host_key, SSH_FP_MD5, SSH_FP_HEX); | 921 | fp = key_fingerprint(host_key, |
922 | ra = key_fingerprint(host_key, SSH_FP_MD5, | 922 | options.fingerprint_hash, SSH_FP_DEFAULT); |
923 | SSH_FP_RANDOMART); | 923 | ra = key_fingerprint(host_key, |
924 | options.fingerprint_hash, SSH_FP_RANDOMART); | ||
924 | logit("Host key fingerprint is %s\n%s\n", fp, ra); | 925 | logit("Host key fingerprint is %s\n%s\n", fp, ra); |
925 | free(ra); | 926 | free(ra); |
926 | free(fp); | 927 | free(fp); |
@@ -959,9 +960,10 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port, | |||
959 | else | 960 | else |
960 | snprintf(msg1, sizeof(msg1), "."); | 961 | snprintf(msg1, sizeof(msg1), "."); |
961 | /* The default */ | 962 | /* The default */ |
962 | fp = key_fingerprint(host_key, SSH_FP_MD5, SSH_FP_HEX); | 963 | fp = key_fingerprint(host_key, |
963 | ra = key_fingerprint(host_key, SSH_FP_MD5, | 964 | options.fingerprint_hash, SSH_FP_DEFAULT); |
964 | SSH_FP_RANDOMART); | 965 | ra = key_fingerprint(host_key, |
966 | options.fingerprint_hash, SSH_FP_RANDOMART); | ||
965 | msg2[0] = '\0'; | 967 | msg2[0] = '\0'; |
966 | if (options.verify_host_key_dns) { | 968 | if (options.verify_host_key_dns) { |
967 | if (matching_host_key_dns) | 969 | if (matching_host_key_dns) |
@@ -1226,7 +1228,7 @@ verify_host_key(char *host, struct sockaddr *hostaddr, Key *host_key) | |||
1226 | struct sshkey *plain = NULL; | 1228 | struct sshkey *plain = NULL; |
1227 | 1229 | ||
1228 | if ((fp = sshkey_fingerprint(host_key, | 1230 | if ((fp = sshkey_fingerprint(host_key, |
1229 | SSH_FP_MD5, SSH_FP_HEX)) == NULL) { | 1231 | options.fingerprint_hash, SSH_FP_DEFAULT)) == NULL) { |
1230 | error("%s: fingerprint host key: %s", __func__, ssh_err(r)); | 1232 | error("%s: fingerprint host key: %s", __func__, ssh_err(r)); |
1231 | r = -1; | 1233 | r = -1; |
1232 | goto out; | 1234 | goto out; |
@@ -1387,8 +1389,10 @@ show_other_keys(struct hostkeys *hostkeys, Key *key) | |||
1387 | continue; | 1389 | continue; |
1388 | if (!lookup_key_in_hostkeys_by_type(hostkeys, type[i], &found)) | 1390 | if (!lookup_key_in_hostkeys_by_type(hostkeys, type[i], &found)) |
1389 | continue; | 1391 | continue; |
1390 | fp = key_fingerprint(found->key, SSH_FP_MD5, SSH_FP_HEX); | 1392 | fp = key_fingerprint(found->key, |
1391 | ra = key_fingerprint(found->key, SSH_FP_MD5, SSH_FP_RANDOMART); | 1393 | options.fingerprint_hash, SSH_FP_DEFAULT); |
1394 | ra = key_fingerprint(found->key, | ||
1395 | options.fingerprint_hash, SSH_FP_RANDOMART); | ||
1392 | logit("WARNING: %s key found for host %s\n" | 1396 | logit("WARNING: %s key found for host %s\n" |
1393 | "in %s:%lu\n" | 1397 | "in %s:%lu\n" |
1394 | "%s key fingerprint %s.", | 1398 | "%s key fingerprint %s.", |
@@ -1409,7 +1413,8 @@ warn_changed_key(Key *host_key) | |||
1409 | { | 1413 | { |
1410 | char *fp; | 1414 | char *fp; |
1411 | 1415 | ||
1412 | fp = key_fingerprint(host_key, SSH_FP_MD5, SSH_FP_HEX); | 1416 | fp = key_fingerprint(host_key, options.fingerprint_hash, |
1417 | SSH_FP_DEFAULT); | ||
1413 | 1418 | ||
1414 | error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); | 1419 | error("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); |
1415 | error("@ WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED! @"); | 1420 | error("@ WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED! @"); |