tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-30 01:05:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

- jakob@cvs.openbsd.org 2003/06/11 10:18:47

Browse Source 
[dns.c]
     sync with check_host_key() change
This commit is contained in:
Damien Miller 2003-06-11 22:05:45 +10:00
parent 7392ae6270
commit 0e1b937f13
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -15,6 +15,9 @@
- jakob@cvs.openbsd.org 2003/06/11 10:16:16 - jakob@cvs.openbsd.org 2003/06/11 10:16:16
[sshconnect.c] [sshconnect.c]
clean up check_host_key() and improve SSHFP feedback. ok markus@ clean up check_host_key() and improve SSHFP feedback. ok markus@
- jakob@cvs.openbsd.org 2003/06/11 10:18:47
[dns.c]
sync with check_host_key() change
20030609 20030609
@ -499,4 +502,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au Report from murple@murple.net, diagnosis from dtucker@zip.com.au
$Id: ChangeLog,v 1.2795 2003/06/11 12:05:25 djm Exp $ $Id: ChangeLog,v 1.2796 2003/06/11 12:05:45 djm Exp $

9
dns.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: dns.c,v 1.5 2003/05/15 02:27:15 jakob Exp $ */ /* $OpenBSD: dns.c,v 1.6 2003/06/11 10:18:47 jakob Exp $ */
/* /*
* Copyright (c) 2003 Wesley Griffin. All rights reserved. * Copyright (c) 2003 Wesley Griffin. All rights reserved.
@ -44,7 +44,7 @@
#include "uuencode.h" #include "uuencode.h"
extern char *__progname; extern char *__progname;
RCSID("$OpenBSD: dns.c,v 1.5 2003/05/15 02:27:15 jakob Exp $"); RCSID("$OpenBSD: dns.c,v 1.6 2003/06/11 10:18:47 jakob Exp $");
#ifndef LWRES #ifndef LWRES
static const char *errset_text[] = { static const char *errset_text[] = {
@ -221,13 +221,8 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address,
/* Matching algoritm and digest. */ /* Matching algoritm and digest. */
freerrset(fingerprints); freerrset(fingerprints);
#ifdef DNSSEC
debug("matching host key fingerprint found in DNS"); debug("matching host key fingerprint found in DNS");
return DNS_VERIFY_OK; return DNS_VERIFY_OK;
#else
logit("Matching host key fingerprint found in DNS.");
return DNS_VERIFY_ERROR;
#endif
} else { } else {
/* Correct algorithm but bad digest */ /* Correct algorithm but bad digest */
debug("verify_hostkey_dns: failed"); debug("verify_hostkey_dns: failed");