RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-02-16 22:06:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

- stevesk@cvs.openbsd.org 2005/10/17 13:45:05

Browse Source 
[dns.c]
     fix memory leaks from 2 sources:
         1) key_fingerprint_raw()
         2) malloc in dns_read_rdata()
     ok jakob@
This commit is contained in:
Damien Miller 2005-11-05 15:09:27 +11:00
parent c1af1d5f40
commit 6571249074
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dns.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: dns.c,v 1.13 2005/10/13 19:13:41 stevesk Exp $ */ /* $OpenBSD: dns.c,v 1.14 2005/10/17 13:45:05 stevesk Exp $ */
/* /*
* Copyright (c) 2003 Wesley Griffin. All rights reserved. * Copyright (c) 2003 Wesley Griffin. All rights reserved.
@ -41,7 +41,7 @@
#include "dns.h" #include "dns.h"
#include "log.h" #include "log.h"
RCSID("$OpenBSD: dns.c,v 1.13 2005/10/13 19:13:41 stevesk Exp $"); RCSID("$OpenBSD: dns.c,v 1.14 2005/10/17 13:45:05 stevesk Exp $");
#ifndef LWRES #ifndef LWRES
static const char *errset_text[] = { static const char *errset_text[] = {
@ -93,12 +93,14 @@ dns_read_key(u_int8_t *algorithm, u_int8_t *digest_type,
*algorithm = SSHFP_KEY_DSA; *algorithm = SSHFP_KEY_DSA;
break; break;
default: default:
*algorithm = SSHFP_KEY_RESERVED; *algorithm = SSHFP_KEY_RESERVED; /* 0 */
} }
if (*algorithm) { if (*algorithm) {
*digest_type = SSHFP_HASH_SHA1; *digest_type = SSHFP_HASH_SHA1;
*digest = key_fingerprint_raw(key, SSH_FP_SHA1, digest_len); *digest = key_fingerprint_raw(key, SSH_FP_SHA1, digest_len);
if (*digest == NULL)
fatal("dns_read_key: null from key_fingerprint_raw()");
success = 1; success = 1;
} else { } else {
*digest_type = SSHFP_HASH_RESERVED; *digest_type = SSHFP_HASH_RESERVED;
@ -131,7 +133,7 @@ dns_read_rdata(u_int8_t *algorithm, u_int8_t *digest_type,
*digest = (u_char *) xmalloc(*digest_len); *digest = (u_char *) xmalloc(*digest_len);
memcpy(*digest, rdata + 2, *digest_len); memcpy(*digest, rdata + 2, *digest_len);
} else { } else {
*digest = NULL; *digest = xstrdup("");
} }
success = 1; success = 1;
@ -245,8 +247,10 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address,
*flags |= DNS_VERIFY_MATCH; *flags |= DNS_VERIFY_MATCH;
} }
} }
xfree(dnskey_digest);
} }
xfree(hostkey_digest); /* from key_fingerprint_raw() */
freerrset(fingerprints); freerrset(fingerprints);
if (*flags & DNS_VERIFY_FOUND) if (*flags & DNS_VERIFY_FOUND)
@ -289,6 +293,7 @@ export_dns_rr(const char *hostname, const Key *key, FILE *f, int generic)
for (i = 0; i < rdata_digest_len; i++) for (i = 0; i < rdata_digest_len; i++)
fprintf(f, "%02x", rdata_digest[i]); fprintf(f, "%02x", rdata_digest[i]);
fprintf(f, "\n"); fprintf(f, "\n");
xfree(rdata_digest); /* from key_fingerprint_raw() */
success = 1; success = 1;
} else { } else {
error("dns_export_rr: unsupported algorithm"); error("dns_export_rr: unsupported algorithm");