From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 21 Jun 2012 07:22:01 +0000 (+0000)
Subject: - fix error handling of alloc failure during rrsig verification.
X-Git-Tag: release-1.4.18rc1~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ba973a8bd31c38bb2ba7a274e49142d3435379c;p=thirdparty%2Funbound.git

- fix error handling of alloc failure during rrsig verification.



git-svn-id: file:///svn/unbound/trunk@2693 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/doc/Changelog b/doc/Changelog
index 10bc30118..735a63ecd 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+21 June 2012: Wouter
+	- fix error handling of alloc failure during rrsig verification.
+
 20 June 2012: Wouter
 	- work on --with-nss build option (for now, --with-libunbound-only).
 
diff --git a/validator/val_secalgo.c b/validator/val_secalgo.c
index c64982404..b52abb4ff 100644
--- a/validator/val_secalgo.c
+++ b/validator/val_secalgo.c
@@ -299,7 +299,7 @@ setup_key_digest(int algo, EVP_PKEY** evp_key, const EVP_MD** digest_type,
 			*evp_key = EVP_PKEY_new();
 			if(!*evp_key) {
 				log_err("verify: malloc failure in crypto");
-				return sec_status_unchecked;
+				return 0;
 			}
 			dsa = ldns_key_buf2dsa_raw(key, keylen);
 			if(!dsa) {
@@ -326,7 +326,7 @@ setup_key_digest(int algo, EVP_PKEY** evp_key, const EVP_MD** digest_type,
 			*evp_key = EVP_PKEY_new();
 			if(!*evp_key) {
 				log_err("verify: malloc failure in crypto");
-				return sec_status_unchecked;
+				return 0;
 			}
 			rsa = ldns_key_buf2rsa_raw(key, keylen);
 			if(!rsa) {
@@ -358,7 +358,7 @@ setup_key_digest(int algo, EVP_PKEY** evp_key, const EVP_MD** digest_type,
 			*evp_key = EVP_PKEY_new();
 			if(!*evp_key) {
 				log_err("verify: malloc failure in crypto");
-				return sec_status_unchecked;
+				return 0;
 			}
 			rsa = ldns_key_buf2rsa_raw(key, keylen);
 			if(!rsa) {
@@ -726,7 +726,7 @@ nss_setup_key_digest(int algo, SECKEYPublicKey** pubkey, HASH_HashType* htype,
 			*evp_key = EVP_PKEY_new();
 			if(!*evp_key) {
 				log_err("verify: malloc failure in crypto");
-				return sec_status_unchecked;
+				return 0;
 			}
 			dsa = ldns_key_buf2dsa_raw(key, keylen);
 			if(!dsa) {
@@ -755,7 +755,7 @@ nss_setup_key_digest(int algo, SECKEYPublicKey** pubkey, HASH_HashType* htype,
 			*pubkey = nss_buf2rsa(key, keylen);
 			if(!*pubkey) {
 				log_err("verify: malloc failure in crypto");
-				return sec_status_unchecked;
+				return 0;
 			}
 			/* select SHA version */
 #if defined(HAVE_EVP_SHA256) && defined(USE_SHA2)
@@ -775,7 +775,7 @@ nss_setup_key_digest(int algo, SECKEYPublicKey** pubkey, HASH_HashType* htype,
 			*pubkey = nss_buf2rsa(key, keylen);
 			if(!*pubkey) {
 				log_err("verify: malloc failure in crypto");
-				return sec_status_unchecked;
+				return 0;
 			}
 			*htype = HASH_AlgMD5;