From: Willem Toorop <willem@nlnetlabs.nl>
Date: Mon, 11 Nov 2013 15:10:34 +0000 (+0100)
Subject: Optimize TSIG digest function name compariso
X-Git-Tag: release-1.6.17rc1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6532d0f917b652456385f8e9248161f97f1275ce;p=thirdparty%2Fldns.git

Optimize TSIG digest function name compariso
---

diff --git a/Changelog b/Changelog
index 7b88f045..4016336e 100644
--- a/Changelog
+++ b/Changelog
@@ -50,6 +50,7 @@
 	* Configure option to build perl bindings: --with-p5-net-ldns
 	  (Net::LDNS is a contribution from Erik Ostlyngen)
 	* bugfix #527: Move -lssl before -lcrypto when linking
+	* Optimize TSIG digest function name comparison (Thanks Marc Buijsman)
 
 1.6.16	2012-11-13
 	* Fix Makefile to build pyldns with BSD make
diff --git a/tsig.c b/tsig.c
index afc25902..53aa85ec 100644
--- a/tsig.c
+++ b/tsig.c
@@ -134,19 +134,15 @@ ldns_digest_function(char *name)
 {
 	/* these are the mandatory algorithms from RFC4635 */
 	/* The optional algorithms are not yet implemented */
-	if (strlen(name) == 12 
-			&& strncasecmp(name, "hmac-sha256.", 11) == 0) {
+	if (strcasecmp(name, "hmac-sha256.") == 0) {
 #ifdef HAVE_EVP_SHA256
 		return EVP_sha256();
 #else
 		return NULL;
 #endif
-	} else if (strlen(name) == 10
-			&& strncasecmp(name, "hmac-sha1.", 9) == 0) {
+	} else if (strcasecmp(name, "hmac-sha1.") == 0) {
 		return EVP_sha1();
-	} else if (strlen(name) == 25 
-			&& strncasecmp(name, "hmac-md5.sig-alg.reg.int.", 25) 
-			== 0) {
+	} else if (strcasecmp(name, "hmac-md5.sig-alg.reg.int.") == 0) {
 		return EVP_md5();
 	} else {
 		return NULL;