Attachment 2184 Details for Bug 2040 – Handle future digest types correctly

[patch] Handle future digest types correctly

0002-Support-for-future-SSHFP-digest-algorithms.patch (text/plain), 2.23 KB, created by Ondrej Caletka on 2012-08-31 19:31:29 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Ondrej Caletka

Created: 2012-08-31 19:31:29 AEST

Size: 2.23 KB

patch

obsolete

>From 95f6afe82b5aef7cb2283f35de487d13198b555e Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ond=C5=99ej=20Caletka?= <ondrej@caletka.cz>
>Date: Fri, 31 Aug 2012 10:45:11 +0200
>Subject: [PATCH 2/3] Support for future SSHFP digest algorithms.
>
>When a SSHFP record is found in DNS, which has digest type other than
>SHA1 or SHA256, whole SSHFP matching is aborted. This patch fixes it.
>---
> dns.c |   21 +++++++--------------
> 1 files changed, 7 insertions(+), 14 deletions(-)
>
>diff --git a/dns.c b/dns.c
>index 760a29c..b688cb1 100644
>--- a/dns.c
>+++ b/dns.c
>@@ -200,7 +200,7 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address,
> 
> 	u_int8_t hostkey_algorithm;
> 	u_int8_t hostkey_digest_type = SSHFP_HASH_RESERVED;
>-	u_char *hostkey_digest;
>+	u_char *hostkey_digest = NULL;
> 	u_int hostkey_digest_len;
> 
> 	u_int8_t dnskey_algorithm;
>@@ -240,14 +240,6 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address,
> 		    fingerprints->rri_nrdatas);
> 	}
> 
>-	/* Initialize default host key parameters */
>-	if (!dns_read_key(&hostkey_algorithm, &hostkey_digest_type,
>-	    &hostkey_digest, &hostkey_digest_len, hostkey)) {
>-		error("Error calculating host key fingerprint.");
>-		freerrset(fingerprints);
>-		return -1;
>-	}
>-
> 	if (fingerprints->rri_nrdatas)
> 		*flags |= DNS_VERIFY_FOUND;
> 
>@@ -268,15 +260,15 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address,
> 
> 		if (hostkey_digest_type != dnskey_digest_type) {
> 			hostkey_digest_type = dnskey_digest_type;
>-			xfree(hostkey_digest);
>+			if (hostkey_digest)
>+				xfree(hostkey_digest); /* from key_fingerprint_raw() */
> 
> 			/* Initialize host key parameters */
> 			if (!dns_read_key(&hostkey_algorithm,
> 			    &hostkey_digest_type, &hostkey_digest,
> 			    &hostkey_digest_len, hostkey)) {
>-				error("Error calculating key fingerprint.");
>-				freerrset(fingerprints);
>-				return -1;
>+				debug("Error calculating key fingerprint.");
>+				continue;
> 			}
> 		}
> 
>@@ -291,7 +283,8 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address,
> 		xfree(dnskey_digest);
> 	}
> 
>-	xfree(hostkey_digest); /* from key_fingerprint_raw() */
>+	if (hostkey_digest)
>+		xfree(hostkey_digest); /* from key_fingerprint_raw() */
> 	freerrset(fingerprints);
> 
> 	if (*flags & DNS_VERIFY_FOUND) {
>-- 
>1.7.8.6
>

Actions: View | Diff

Attachments on bug 2040: 2183 | 2184 | 2188 | 2211 | 2402 | 2403