From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Tue, 8 Jul 2014 12:09:55 +0000 (+0200)
Subject: Allow specifying GNUTLS_CPUID_OVERRIDE in either hex or decimal.
X-Git-Tag: gnutls_3_3_6~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=999a433c3d8bbeb528d27cc119cf77d7e43e7a73;p=thirdparty%2Fgnutls.git

Allow specifying GNUTLS_CPUID_OVERRIDE in either hex or decimal.
---

diff --git a/lib/accelerated/x86/x86-common.c b/lib/accelerated/x86/x86-common.c
index b8b8cf21ea..3e9f13c86f 100644
--- a/lib/accelerated/x86/x86-common.c
+++ b/lib/accelerated/x86/x86-common.c
@@ -570,7 +570,7 @@ void register_x86_crypto(void)
 	char *p;
 	p = getenv("GNUTLS_CPUID_OVERRIDE");
 	if (p) {
-		capabilities = atoi(p);
+		capabilities = strtol(p, NULL, 0);
 	}
 	
 	register_x86_intel_crypto(capabilities);