From: Wouter Wijngaards <wouter@NLnetLabs.nl>
Date: Mon, 17 Dec 2012 08:27:08 +0000 (+0000)
Subject: And now uses sha256.c defined constants.
X-Git-Tag: release-1.6.17rc1~147
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6556cba4e4b5084d52e33ecd00393fde65acc032;p=thirdparty%2Fldns.git

And now uses sha256.c defined constants.
---

diff --git a/dane.c b/dane.c
index 67ce09a1..5e589a78 100644
--- a/dane.c
+++ b/dane.c
@@ -121,16 +121,15 @@ ldns_dane_cert2rdf(ldns_rdf** rdf, X509* cert,
 		return *rdf ? LDNS_STATUS_OK : LDNS_STATUS_MEM_ERR;
 		break;
 	
-#ifdef USE_SHA2
 	case LDNS_TLSA_MATCHING_TYPE_SHA256:
 
-		digest = LDNS_XMALLOC(unsigned char, SHA256_DIGEST_LENGTH);
+		digest = LDNS_XMALLOC(unsigned char, LDNS_SHA256_DIGEST_LENGTH);
 		if (digest == NULL) {
 			LDNS_FREE(buf);
 			return LDNS_STATUS_MEM_ERR;
 		}
 		(void) ldns_sha256(buf, (unsigned int)len, digest);
-		*rdf = ldns_rdf_new(LDNS_RDF_TYPE_HEX, SHA256_DIGEST_LENGTH,
+		*rdf = ldns_rdf_new(LDNS_RDF_TYPE_HEX, LDNS_SHA256_DIGEST_LENGTH,
 				digest);
 		LDNS_FREE(buf);
 
@@ -139,19 +138,18 @@ ldns_dane_cert2rdf(ldns_rdf** rdf, X509* cert,
 
 	case LDNS_TLSA_MATCHING_TYPE_SHA512:
 
-		digest = LDNS_XMALLOC(unsigned char, SHA512_DIGEST_LENGTH);
+		digest = LDNS_XMALLOC(unsigned char, LDNS_SHA512_DIGEST_LENGTH);
 		if (digest == NULL) {
 			LDNS_FREE(buf);
 			return LDNS_STATUS_MEM_ERR;
 		}
 		(void) ldns_sha512(buf, (unsigned int)len, digest);
-		*rdf = ldns_rdf_new(LDNS_RDF_TYPE_HEX, SHA512_DIGEST_LENGTH,
+		*rdf = ldns_rdf_new(LDNS_RDF_TYPE_HEX, LDNS_SHA512_DIGEST_LENGTH,
 				digest);
 		LDNS_FREE(buf);
 
 		return *rdf ? LDNS_STATUS_OK : LDNS_STATUS_MEM_ERR;
 		break;
-#endif /* USE_SHA2 */
 	
 	default:
 		LDNS_FREE(buf);