x86:Modify variable name

Modify the variables _gnutls_sha_padlock and _gnutls_sha_padlock_nano.
Add a comment for detecting CPU. Modify the indentation. Delete
initialization etc.

Signed-off-by: JonasZhou <JonasZhou@zhaoxin.com>

5 files changed, 31 insertions, 29 deletions

diff --git a/lib/accelerated/x86/aes-padlock.h b/lib/accelerated/x86/aes-padlock.h
index cd9dc23609..378a90e5c0 100644
--- a/lib/accelerated/x86/aes-padlock.h
+++ b/lib/accelerated/x86/aes-padlock.h
@@ -30,8 +30,8 @@ struct padlock_ctx {
 extern const gnutls_crypto_cipher_st _gnutls_aes_padlock;
 extern const gnutls_crypto_cipher_st _gnutls_aes_gcm_padlock;
 
-extern const gnutls_crypto_mac_st _gnutls_hmac_sha_padlock;
-extern const gnutls_crypto_digest_st _gnutls_sha_padlock;
+extern const gnutls_crypto_mac_st _gnutls_hmac_sha_padlock_oneshot;
+extern const gnutls_crypto_digest_st _gnutls_sha_padlock_oneshot;
 
 int padlock_aes_cipher_setkey(void *_ctx, const void *userkey,
 			      size_t keysize);
diff --git a/lib/accelerated/x86/hmac-padlock.c b/lib/accelerated/x86/hmac-padlock.c
index fd81f5c5fd..043665a89c 100644
--- a/lib/accelerated/x86/hmac-padlock.c
+++ b/lib/accelerated/x86/hmac-padlock.c
@@ -347,7 +347,7 @@ wrap_padlock_hmac_fast(gnutls_mac_algorithm_t algo,
 	return 0;
 }
 
-const gnutls_crypto_mac_st _gnutls_hmac_sha_padlock = {
+const gnutls_crypto_mac_st _gnutls_hmac_sha_padlock_oneshot = {
 	.init = NULL,
 	.setkey = NULL,
 	.setnonce = NULL,
@@ -357,7 +357,7 @@ const gnutls_crypto_mac_st _gnutls_hmac_sha_padlock = {
 	.fast = wrap_padlock_hmac_fast
 };
 
-const gnutls_crypto_mac_st _gnutls_hmac_sha_padlock_enhance = {
+const gnutls_crypto_mac_st _gnutls_hmac_sha_padlock = {
 	.init = wrap_padlock_hmac_init,
 	.setkey = wrap_padlock_hmac_setkey,
 	.setnonce = NULL,
diff --git a/lib/accelerated/x86/sha-padlock.c b/lib/accelerated/x86/sha-padlock.c
index c40a3e805e..4c0da36ef3 100644
--- a/lib/accelerated/x86/sha-padlock.c
+++ b/lib/accelerated/x86/sha-padlock.c
@@ -375,7 +375,7 @@ const struct nettle_hash padlock_sha256 = NN_HASH(sha256, padlock_sha256_update,
 const struct nettle_hash padlock_sha384 = NN_HASH(sha384, padlock_sha512_update, padlock_sha512_digest, SHA384);
 const struct nettle_hash padlock_sha512 = NN_HASH(sha512, padlock_sha512_update, padlock_sha512_digest, SHA512);
 
-const gnutls_crypto_digest_st _gnutls_sha_padlock = {
+const gnutls_crypto_digest_st _gnutls_sha_padlock_oneshot = {
 	.init = NULL,
 	.hash = NULL,
 	.output = NULL,
@@ -383,7 +383,7 @@ const gnutls_crypto_digest_st _gnutls_sha_padlock = {
 	.fast = wrap_padlock_hash_fast
 };
 
-const gnutls_crypto_digest_st _gnutls_sha_padlock_enhance = {
+const gnutls_crypto_digest_st _gnutls_sha_padlock = {
 	.init = wrap_padlock_hash_init,
 	.hash = wrap_padlock_hash_update,
 	.output = wrap_padlock_hash_output,
diff --git a/lib/accelerated/x86/sha-padlock.h b/lib/accelerated/x86/sha-padlock.h
index f626f17e1b..fda6fba778 100644
--- a/lib/accelerated/x86/sha-padlock.h
+++ b/lib/accelerated/x86/sha-padlock.h
@@ -30,7 +30,7 @@ extern const struct nettle_hash padlock_sha256;
 extern const struct nettle_hash padlock_sha384;
 extern const struct nettle_hash padlock_sha512;
 
-extern const gnutls_crypto_mac_st _gnutls_hmac_sha_padlock_enhance;
-extern const gnutls_crypto_digest_st _gnutls_sha_padlock_enhance;
+extern const gnutls_crypto_mac_st _gnutls_hmac_sha_padlock;
+extern const gnutls_crypto_digest_st _gnutls_sha_padlock;
 
 #endif /* GNUTLS_LIB_ACCELERATED_X86_SHA_PADLOCK_H */
diff --git a/lib/accelerated/x86/x86-common.c b/lib/accelerated/x86/x86-common.c
index 33fa40d4a3..13272cd6b0 100644
--- a/lib/accelerated/x86/x86-common.c
+++ b/lib/accelerated/x86/x86-common.c
@@ -306,12 +306,13 @@ static int check_phe_sha512(unsigned edx)
 static int check_fast_pclmul(void)
 {
 	unsigned int a,b,c,d;
-	a = b = c = d = 0;
+	unsigned int family,model;
+
 	if (__get_cpuid(1, &a, &b, &c, &d))
 		return 0;
 
-	unsigned int family = ((a >> 8) & 0x0F);
-	unsigned int model = ((a >> 4) & 0x0F) + ((a >> 12) & 0xF0);
+	family = ((a >> 8) & 0x0F);
+	model = ((a >> 4) & 0x0F) + ((a >> 12) & 0xF0);
 
 	if(((family == 0x6) && (model == 0xf || model == 0x19)) ||
 		((family == 0x7) && (model == 0x1B || model == 0x3B)))
@@ -349,11 +350,12 @@ static unsigned check_zhaoxin(void)
 	if (!__get_cpuid(0, &a, &b, &c, &d))
 		return 0;
 
+	/* Zhaoxin and VIA CPU was detected */
 	if ((memcmp(&b, "Cent", 4) == 0 &&
 	     memcmp(&d, "aurH", 4) == 0 &&
-         memcmp(&c, "auls", 4) == 0) ||
-        (memcmp(&b, "  Sh", 4) == 0 &&
-         memcmp(&d, "angh", 4) == 0 && memcmp(&c, "ai  ", 4) == 0)) {
+	     memcmp(&c, "auls", 4) == 0) ||
+	    (memcmp(&b, "  Sh", 4) == 0 &&
+	     memcmp(&d, "angh", 4) == 0 && memcmp(&c, "ai  ", 4) == 0)) {
 		return 1;
 	}
 
@@ -371,8 +373,8 @@ void register_x86_padlock_crypto(unsigned capabilities)
 		return;
 
 	if (capabilities == 0){
-        if(!read_cpuid_vals(_gnutls_x86_cpuid_s))
-            return;
+		if(!read_cpuid_vals(_gnutls_x86_cpuid_s))
+			return;
 		edx = padlock_capability();
 	} else{
 		capabilities_to_intel_cpuid(capabilities);
@@ -712,7 +714,7 @@ void register_x86_padlock_crypto(unsigned capabilities)
 			ret =
 			    gnutls_crypto_single_digest_register
 			    (GNUTLS_DIG_SHA384, 80,
-			     &_gnutls_sha_padlock_enhance, 0);
+			     &_gnutls_sha_padlock, 0);
 			if (ret < 0) {
 				gnutls_assert();
 			}
@@ -720,7 +722,7 @@ void register_x86_padlock_crypto(unsigned capabilities)
 			ret =
 			    gnutls_crypto_single_digest_register
 			    (GNUTLS_DIG_SHA512, 80,
-			     &_gnutls_sha_padlock_enhance, 0);
+			     &_gnutls_sha_padlock, 0);
 			if (ret < 0) {
 				gnutls_assert();
 			}
@@ -728,7 +730,7 @@ void register_x86_padlock_crypto(unsigned capabilities)
 			ret =
 			    gnutls_crypto_single_mac_register
 			    (GNUTLS_MAC_SHA384, 80,
-			     &_gnutls_hmac_sha_padlock_enhance, 0);
+			     &_gnutls_hmac_sha_padlock, 0);
 			if (ret < 0) {
 				gnutls_assert();
 			}
@@ -736,7 +738,7 @@ void register_x86_padlock_crypto(unsigned capabilities)
 			ret =
 			    gnutls_crypto_single_mac_register
 			    (GNUTLS_MAC_SHA512, 80,
-			     &_gnutls_hmac_sha_padlock_enhance, 0);
+			     &_gnutls_hmac_sha_padlock, 0);
 			if (ret < 0) {
 				gnutls_assert();
 			}
@@ -745,7 +747,7 @@ void register_x86_padlock_crypto(unsigned capabilities)
 		ret =
 		    gnutls_crypto_single_digest_register(GNUTLS_DIG_SHA1,
 							 90,
-							 &_gnutls_sha_padlock_enhance, 0);
+							 &_gnutls_sha_padlock, 0);
 		if (ret < 0) {
 			gnutls_assert();
 		}
@@ -753,7 +755,7 @@ void register_x86_padlock_crypto(unsigned capabilities)
 		ret =
 		    gnutls_crypto_single_digest_register(GNUTLS_DIG_SHA224,
 							 90,
-							 &_gnutls_sha_padlock_enhance, 0);
+							 &_gnutls_sha_padlock, 0);
 		if (ret < 0) {
 			gnutls_assert();
 		}
@@ -761,7 +763,7 @@ void register_x86_padlock_crypto(unsigned capabilities)
 		ret =
 		    gnutls_crypto_single_digest_register(GNUTLS_DIG_SHA256,
 							 90,
-							 &_gnutls_sha_padlock_enhance, 0);
+							 &_gnutls_sha_padlock, 0);
 		if (ret < 0) {
 			gnutls_assert();
 		}
@@ -769,7 +771,7 @@ void register_x86_padlock_crypto(unsigned capabilities)
 		ret =
 		    gnutls_crypto_single_mac_register(GNUTLS_MAC_SHA1,
 						      90,
-						      &_gnutls_hmac_sha_padlock_enhance, 0);
+						      &_gnutls_hmac_sha_padlock, 0);
 		if (ret < 0) {
 			gnutls_assert();
 		}
@@ -779,7 +781,7 @@ void register_x86_padlock_crypto(unsigned capabilities)
 		ret =
 		    gnutls_crypto_single_mac_register(GNUTLS_MAC_SHA256,
 						      90,
-						      &_gnutls_hmac_sha_padlock_enhance, 0);
+						      &_gnutls_hmac_sha_padlock, 0);
 		if (ret < 0) {
 			gnutls_assert();
 		}
@@ -791,7 +793,7 @@ void register_x86_padlock_crypto(unsigned capabilities)
 		ret =
 		    gnutls_crypto_single_digest_register(GNUTLS_DIG_SHA1,
 							 90,
-							 &_gnutls_sha_padlock, 0);
+							 &_gnutls_sha_padlock_oneshot, 0);
 		if (ret < 0) {
 			gnutls_assert();
 		}
@@ -799,7 +801,7 @@ void register_x86_padlock_crypto(unsigned capabilities)
 		ret =
 		    gnutls_crypto_single_digest_register(GNUTLS_DIG_SHA256,
 							 90,
-							 &_gnutls_sha_padlock, 0);
+							 &_gnutls_sha_padlock_oneshot, 0);
 		if (ret < 0) {
 			gnutls_assert();
 		}
@@ -807,7 +809,7 @@ void register_x86_padlock_crypto(unsigned capabilities)
 		ret =
 		    gnutls_crypto_single_mac_register(GNUTLS_MAC_SHA1,
 						      90,
-						      &_gnutls_hmac_sha_padlock, 0);
+						      &_gnutls_hmac_sha_padlock_oneshot, 0);
 		if (ret < 0) {
 			gnutls_assert();
 		}
@@ -815,7 +817,7 @@ void register_x86_padlock_crypto(unsigned capabilities)
 		ret =
 		    gnutls_crypto_single_mac_register(GNUTLS_MAC_SHA256,
 						      90,
-						      &_gnutls_hmac_sha_padlock, 0);
+						      &_gnutls_hmac_sha_padlock_oneshot, 0);
 		if (ret < 0) {
 			gnutls_assert();
 		}