X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fmodes%2Fgcm128.c;h=e638e42be857fdc8bf82bc1ac34012b65cffad3b;hb=3c075bf07f2d57c0272260409bf38fb6f438b016;hp=8a76e1a7fd6d596acdc9d00adfce3594a512694b;hpb=7af0400297ee6438c0569a0f9f81b2be55264078;p=oweals%2Fopenssl.git

diff --git a/crypto/modes/gcm128.c b/crypto/modes/gcm128.c
index 8a76e1a7fd..e638e42be8 100644
--- a/crypto/modes/gcm128.c
+++ b/crypto/modes/gcm128.c
@@ -148,6 +148,7 @@ static void gcm_gmult_8bit(u64 Xi[2], const u128 Htable[256])
 	const u8 *xi = (const u8 *)Xi+15;
 	size_t rem, n = *xi;
 	const union { long one; char little; } is_endian = {1};
+	__fips_constseg
 	static const size_t rem_8bit[256] = {
 		PACK(0x0000), PACK(0x01C2), PACK(0x0384), PACK(0x0246),
 		PACK(0x0708), PACK(0x06CA), PACK(0x048C), PACK(0x054E),
@@ -326,6 +327,7 @@ static void gcm_init_4bit(u128 Htable[16], u64 H[2])
 }
 
 #ifndef GHASH_ASM
+__fips_constseg
 static const size_t rem_4bit[16] = {
 	PACK(0x0000), PACK(0x1C20), PACK(0x3840), PACK(0x2460),
 	PACK(0x7080), PACK(0x6CA0), PACK(0x48C0), PACK(0x54E0),
@@ -461,6 +463,7 @@ static void gcm_ghash_4bit(u64 Xi[2],const u128 Htable[16],
      */ 
     u128 Hshr4[16];	/* Htable shifted right by 4 bits */
     u8   Hshl4[16];	/* Htable shifted left  by 4 bits */
+    __fips_constseg
     static const unsigned short rem_8bit[256] = {
 	0x0000, 0x01C2, 0x0384, 0x0246, 0x0708, 0x06CA, 0x048C, 0x054E,
 	0x0E10, 0x0FD2, 0x0D94, 0x0C56, 0x0918, 0x08DA, 0x0A9C, 0x0B5E,
@@ -668,8 +671,6 @@ void gcm_ghash_4bit_x86(u64 Xi[2],const u128 Htable[16],const u8 *inp,size_t len
 #  if __ARM_ARCH__>=7
 #   define GHASH_ASM_ARM
 #   define GCM_FUNCREF_4BIT
-extern unsigned int OPENSSL_armcap;
-
 void gcm_gmult_neon(u64 Xi[2],const u128 Htable[16]);
 void gcm_ghash_neon(u64 Xi[2],const u128 Htable[16],const u8 *inp,size_t len);
 #  endif
@@ -715,7 +716,8 @@ void CRYPTO_gcm128_init(GCM128_CONTEXT *ctx,void *key,block128_f block)
 #elif	TABLE_BITS==4
 # if	defined(GHASH_ASM_X86_OR_64)
 #  if	!defined(GHASH_ASM_X86) || defined(OPENSSL_IA32_SSE2)
-	if (OPENSSL_ia32cap_P[1]&(1<<1)) {	/* check PCLMULQDQ bit */
+	if (OPENSSL_ia32cap_P[0]&(1<<24) &&	/* check FXSR bit */
+	    OPENSSL_ia32cap_P[1]&(1<<1) ) {	/* check PCLMULQDQ bit */
 		gcm_init_clmul(ctx->Htable,ctx->H.u);
 		ctx->gmult = gcm_gmult_clmul;
 		ctx->ghash = gcm_ghash_clmul;
@@ -736,7 +738,7 @@ void CRYPTO_gcm128_init(GCM128_CONTEXT *ctx,void *key,block128_f block)
 	ctx->ghash = gcm_ghash_4bit;
 #  endif
 # elif	defined(GHASH_ASM_ARM)
-	if (OPENSSL_armcap & 1) {
+	if (OPENSSL_armcap_P & ARMV7_NEON) {
 		ctx->gmult = gcm_gmult_neon;
 		ctx->ghash = gcm_ghash_neon;
 	} else {
@@ -884,7 +886,9 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
 	const union { long one; char little; } is_endian = {1};
 	unsigned int n, ctr;
 	size_t i;
-	u64 mlen = ctx->len.u[1];
+	u64        mlen  = ctx->len.u[1];
+	block128_f block = ctx->block;
+	void      *key   = ctx->key;
 #ifdef GCM_FUNCREF_4BIT
 	void (*gcm_gmult_p)(u64 Xi[2],const u128 Htable[16])	= ctx->gmult;
 # ifdef GHASH
@@ -936,7 +940,7 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
 		    size_t j=GHASH_CHUNK;
 
 		    while (j) {
-			(*ctx->block)(ctx->Yi.c,ctx->EKi.c,ctx->key);
+			(*block)(ctx->Yi.c,ctx->EKi.c,key);
 			++ctr;
 			if (is_endian.little)
 				PUTU32(ctx->Yi.c+12,ctr);
@@ -956,7 +960,7 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
 		    size_t j=i;
 
 		    while (len>=16) {
-			(*ctx->block)(ctx->Yi.c,ctx->EKi.c,ctx->key);
+			(*block)(ctx->Yi.c,ctx->EKi.c,key);
 			++ctr;
 			if (is_endian.little)
 				PUTU32(ctx->Yi.c+12,ctr);
@@ -973,7 +977,7 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
 		}
 #else
 		while (len>=16) {
-			(*ctx->block)(ctx->Yi.c,ctx->EKi.c,ctx->key);
+			(*block)(ctx->Yi.c,ctx->EKi.c,key);
 			++ctr;
 			if (is_endian.little)
 				PUTU32(ctx->Yi.c+12,ctr);
@@ -990,7 +994,7 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
 		}
 #endif
 		if (len) {
-			(*ctx->block)(ctx->Yi.c,ctx->EKi.c,ctx->key);
+			(*block)(ctx->Yi.c,ctx->EKi.c,key);
 			++ctr;
 			if (is_endian.little)
 				PUTU32(ctx->Yi.c+12,ctr);
@@ -1008,7 +1012,7 @@ int CRYPTO_gcm128_encrypt(GCM128_CONTEXT *ctx,
 #endif
 	for (i=0;i<len;++i) {
 		if (n==0) {
-			(*ctx->block)(ctx->Yi.c,ctx->EKi.c,ctx->key);
+			(*block)(ctx->Yi.c,ctx->EKi.c,key);
 			++ctr;
 			if (is_endian.little)
 				PUTU32(ctx->Yi.c+12,ctr);
@@ -1032,7 +1036,9 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
 	const union { long one; char little; } is_endian = {1};
 	unsigned int n, ctr;
 	size_t i;
-	u64 mlen = ctx->len.u[1];
+	u64        mlen  = ctx->len.u[1];
+	block128_f block = ctx->block;
+	void      *key   = ctx->key;
 #ifdef GCM_FUNCREF_4BIT
 	void (*gcm_gmult_p)(u64 Xi[2],const u128 Htable[16])	= ctx->gmult;
 # ifdef GHASH
@@ -1084,7 +1090,7 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
 
 		    GHASH(ctx,in,GHASH_CHUNK);
 		    while (j) {
-			(*ctx->block)(ctx->Yi.c,ctx->EKi.c,ctx->key);
+			(*block)(ctx->Yi.c,ctx->EKi.c,key);
 			++ctr;
 			if (is_endian.little)
 				PUTU32(ctx->Yi.c+12,ctr);
@@ -1102,7 +1108,7 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
 		if ((i = (len&(size_t)-16))) {
 		    GHASH(ctx,in,i);
 		    while (len>=16) {
-			(*ctx->block)(ctx->Yi.c,ctx->EKi.c,ctx->key);
+			(*block)(ctx->Yi.c,ctx->EKi.c,key);
 			++ctr;
 			if (is_endian.little)
 				PUTU32(ctx->Yi.c+12,ctr);
@@ -1118,7 +1124,7 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
 		}
 #else
 		while (len>=16) {
-			(*ctx->block)(ctx->Yi.c,ctx->EKi.c,ctx->key);
+			(*block)(ctx->Yi.c,ctx->EKi.c,key);
 			++ctr;
 			if (is_endian.little)
 				PUTU32(ctx->Yi.c+12,ctr);
@@ -1136,7 +1142,7 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
 		}
 #endif
 		if (len) {
-			(*ctx->block)(ctx->Yi.c,ctx->EKi.c,ctx->key);
+			(*block)(ctx->Yi.c,ctx->EKi.c,key);
 			++ctr;
 			if (is_endian.little)
 				PUTU32(ctx->Yi.c+12,ctr);
@@ -1157,7 +1163,7 @@ int CRYPTO_gcm128_decrypt(GCM128_CONTEXT *ctx,
 	for (i=0;i<len;++i) {
 		u8 c;
 		if (n==0) {
-			(*ctx->block)(ctx->Yi.c,ctx->EKi.c,ctx->key);
+			(*block)(ctx->Yi.c,ctx->EKi.c,key);
 			++ctr;
 			if (is_endian.little)
 				PUTU32(ctx->Yi.c+12,ctr);
@@ -1183,7 +1189,8 @@ int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx,
 	const union { long one; char little; } is_endian = {1};
 	unsigned int n, ctr;
 	size_t i;
-	u64 mlen = ctx->len.u[1];
+	u64   mlen = ctx->len.u[1];
+	void *key  = ctx->key;
 #ifdef GCM_FUNCREF_4BIT
 	void (*gcm_gmult_p)(u64 Xi[2],const u128 Htable[16])	= ctx->gmult;
 # ifdef GHASH
@@ -1223,7 +1230,7 @@ int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx,
 	}
 #if defined(GHASH) && !defined(OPENSSL_SMALL_FOOTPRINT)
 	while (len>=GHASH_CHUNK) {
-		(*stream)(in,out,GHASH_CHUNK/16,ctx->key,ctx->Yi.c);
+		(*stream)(in,out,GHASH_CHUNK/16,key,ctx->Yi.c);
 		ctr += GHASH_CHUNK/16;
 		if (is_endian.little)
 			PUTU32(ctx->Yi.c+12,ctr);
@@ -1238,7 +1245,7 @@ int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx,
 	if ((i = (len&(size_t)-16))) {
 		size_t j=i/16;
 
-		(*stream)(in,out,j,ctx->key,ctx->Yi.c);
+		(*stream)(in,out,j,key,ctx->Yi.c);
 		ctr += (unsigned int)j;
 		if (is_endian.little)
 			PUTU32(ctx->Yi.c+12,ctr);
@@ -1258,7 +1265,7 @@ int CRYPTO_gcm128_encrypt_ctr32(GCM128_CONTEXT *ctx,
 #endif
 	}
 	if (len) {
-		(*ctx->block)(ctx->Yi.c,ctx->EKi.c,ctx->key);
+		(*ctx->block)(ctx->Yi.c,ctx->EKi.c,key);
 		++ctr;
 		if (is_endian.little)
 			PUTU32(ctx->Yi.c+12,ctr);
@@ -1281,7 +1288,8 @@ int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
 	const union { long one; char little; } is_endian = {1};
 	unsigned int n, ctr;
 	size_t i;
-	u64 mlen = ctx->len.u[1];
+	u64   mlen = ctx->len.u[1];
+	void *key  = ctx->key;
 #ifdef GCM_FUNCREF_4BIT
 	void (*gcm_gmult_p)(u64 Xi[2],const u128 Htable[16])	= ctx->gmult;
 # ifdef GHASH
@@ -1324,7 +1332,7 @@ int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
 #if defined(GHASH) && !defined(OPENSSL_SMALL_FOOTPRINT)
 	while (len>=GHASH_CHUNK) {
 		GHASH(ctx,in,GHASH_CHUNK);
-		(*stream)(in,out,GHASH_CHUNK/16,ctx->key,ctx->Yi.c);
+		(*stream)(in,out,GHASH_CHUNK/16,key,ctx->Yi.c);
 		ctr += GHASH_CHUNK/16;
 		if (is_endian.little)
 			PUTU32(ctx->Yi.c+12,ctr);
@@ -1350,7 +1358,7 @@ int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
 		j   = i/16;
 		in -= i;
 #endif
-		(*stream)(in,out,j,ctx->key,ctx->Yi.c);
+		(*stream)(in,out,j,key,ctx->Yi.c);
 		ctr += (unsigned int)j;
 		if (is_endian.little)
 			PUTU32(ctx->Yi.c+12,ctr);
@@ -1361,7 +1369,7 @@ int CRYPTO_gcm128_decrypt_ctr32(GCM128_CONTEXT *ctx,
 		len -= i;
 	}
 	if (len) {
-		(*ctx->block)(ctx->Yi.c,ctx->EKi.c,ctx->key);
+		(*ctx->block)(ctx->Yi.c,ctx->EKi.c,key);
 		++ctr;
 		if (is_endian.little)
 			PUTU32(ctx->Yi.c+12,ctr);