diff options
Diffstat (limited to 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sshconnect.c b/sshconnect.c index afe294660..2eaf020e0 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect.c,v 1.299 2018/07/09 21:03:30 markus Exp $ */ | 1 | /* $OpenBSD: sshconnect.c,v 1.300 2018/07/11 18:53:29 markus 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 |
@@ -49,14 +49,13 @@ | |||
49 | #endif | 49 | #endif |
50 | 50 | ||
51 | #include "xmalloc.h" | 51 | #include "xmalloc.h" |
52 | #include "key.h" | ||
53 | #include "hostfile.h" | 52 | #include "hostfile.h" |
54 | #include "ssh.h" | 53 | #include "ssh.h" |
55 | #include "sshbuf.h" | 54 | #include "sshbuf.h" |
56 | #include "packet.h" | 55 | #include "packet.h" |
57 | #include "uidswap.h" | 56 | #include "uidswap.h" |
58 | #include "compat.h" | 57 | #include "compat.h" |
59 | #include "key.h" | 58 | #include "sshkey.h" |
60 | #include "sshconnect.h" | 59 | #include "sshconnect.h" |
61 | #include "hostfile.h" | 60 | #include "hostfile.h" |
62 | #include "log.h" | 61 | #include "log.h" |
@@ -767,7 +766,7 @@ check_host_cert(const char *host, const struct sshkey *host_key) | |||
767 | { | 766 | { |
768 | const char *reason; | 767 | const char *reason; |
769 | 768 | ||
770 | if (key_cert_check_authority(host_key, 1, 0, host, &reason) != 0) { | 769 | if (sshkey_cert_check_authority(host_key, 1, 0, host, &reason) != 0) { |
771 | error("%s", reason); | 770 | error("%s", reason); |
772 | return 0; | 771 | return 0; |
773 | } | 772 | } |
@@ -1496,9 +1495,9 @@ show_other_keys(struct hostkeys *hostkeys, struct sshkey *key) | |||
1496 | logit("WARNING: %s key found for host %s\n" | 1495 | logit("WARNING: %s key found for host %s\n" |
1497 | "in %s:%lu\n" | 1496 | "in %s:%lu\n" |
1498 | "%s key fingerprint %s.", | 1497 | "%s key fingerprint %s.", |
1499 | key_type(found->key), | 1498 | sshkey_type(found->key), |
1500 | found->host, found->file, found->line, | 1499 | found->host, found->file, found->line, |
1501 | key_type(found->key), fp); | 1500 | sshkey_type(found->key), fp); |
1502 | if (options.visual_host_key) | 1501 | if (options.visual_host_key) |
1503 | logit("%s", ra); | 1502 | logit("%s", ra); |
1504 | free(ra); | 1503 | free(ra); |
@@ -1525,7 +1524,7 @@ warn_changed_key(struct sshkey *host_key) | |||
1525 | error("Someone could be eavesdropping on you right now (man-in-the-middle attack)!"); | 1524 | error("Someone could be eavesdropping on you right now (man-in-the-middle attack)!"); |
1526 | error("It is also possible that a host key has just been changed."); | 1525 | error("It is also possible that a host key has just been changed."); |
1527 | error("The fingerprint for the %s key sent by the remote host is\n%s.", | 1526 | error("The fingerprint for the %s key sent by the remote host is\n%s.", |
1528 | key_type(host_key), fp); | 1527 | sshkey_type(host_key), fp); |
1529 | error("Please contact your system administrator."); | 1528 | error("Please contact your system administrator."); |
1530 | 1529 | ||
1531 | free(fp); | 1530 | free(fp); |