Commit 5cd1aa4f authored by Andy Polyakov's avatar Andy Polyakov
Browse files

crypto/evp/e_aes.c: fix logical pre-processor bug and formatting. 

Bug would emerge when XTS is added to bsaes-armv7.pl. Pointed out by
Ard Biesheuvel of Linaro.
(cherry picked from commit 044f63086051d7542fa9485a1432498c39c4d8fa)
parent 04b80f40

crypto/evp/e_aes.c

+11 −5
Original line number Diff line number Diff line
@@ -842,7 +842,10 @@ static int aes_gcm_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, 
			gctx->ctr = NULL;

			break;

			}

		else

#endif

		(void)0;	/* terminate potentially open 'else' */



		AES_set_encrypt_key(key, ctx->key_len * 8, &gctx->ks);

		CRYPTO_gcm128_init(&gctx->gcm, &gctx->ks, (block128_f)AES_encrypt);

#ifdef AES_CTR_ASM
@@ -1090,7 +1093,10 @@ static int aes_xts_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, 
		    xctx->xts.key1 = &xctx->ks1;

		    break;

		    }

		else

#endif

		(void)0;	/* terminate potentially open 'else' */



		if (enc)

			{

			AES_set_encrypt_key(key, ctx->key_len * 4, &xctx->ks1);