diff options
author | Damien Miller <djm@mindrot.org> | 2010-04-16 15:53:02 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-04-16 15:53:02 +1000 |
commit | 672839994eaadecc95f3fada1cf014487631f068 (patch) | |
tree | 6b592be8cfd3653d0c837f72260d0d2fcb1bc32b | |
parent | deb5a1423a72cb96c629d5514be58897cd7a24ce (diff) |
- djm@cvs.openbsd.org 2010/04/10 00:04:30
[sshconnect.c]
fix terminology: we didn't find a certificate in known_hosts, we found
a CA key
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | sshconnect.c | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -15,6 +15,10 @@ | |||
15 | [ssh.c] | 15 | [ssh.c] |
16 | bz#1746 - suppress spurious tty warning when using -O and stdin | 16 | bz#1746 - suppress spurious tty warning when using -O and stdin |
17 | is not a tty; ok dtucker@ markus@ | 17 | is not a tty; ok dtucker@ markus@ |
18 | - djm@cvs.openbsd.org 2010/04/10 00:04:30 | ||
19 | [sshconnect.c] | ||
20 | fix terminology: we didn't find a certificate in known_hosts, we found | ||
21 | a CA key | ||
18 | 22 | ||
19 | 20100410 | 23 | 20100410 |
20 | - (dtucker) [configure.ac] Put the check for the existence of getaddrinfo | 24 | - (dtucker) [configure.ac] Put the check for the existence of getaddrinfo |
diff --git a/sshconnect.c b/sshconnect.c index 9de52224d..effe6dae8 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect.c,v 1.220 2010/03/04 10:36:03 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect.c,v 1.221 2010/04/10 00:04:30 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 |
@@ -739,7 +739,7 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port, | |||
739 | debug("Host '%.200s' is known and matches the %s host %s.", | 739 | debug("Host '%.200s' is known and matches the %s host %s.", |
740 | host, type, want_cert ? "certificate" : "key"); | 740 | host, type, want_cert ? "certificate" : "key"); |
741 | debug("Found %s in %s:%d", | 741 | debug("Found %s in %s:%d", |
742 | want_cert ? "certificate" : "key", host_file, host_line); | 742 | want_cert ? "CA key" : "key", host_file, host_line); |
743 | if (want_cert && !check_host_cert(hostname, host_key)) | 743 | if (want_cert && !check_host_cert(hostname, host_key)) |
744 | goto fail; | 744 | goto fail; |
745 | if (options.check_host_ip && ip_status == HOST_NEW) { | 745 | if (options.check_host_ip && ip_status == HOST_NEW) { |