From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 23 Oct 2011 17:06:28 +0000 (+0000)
Subject: No need for custom flag in XTS mode: block length is 1.
X-Git-Tag: OpenSSL-fips-2_0-rc1~7
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f59a5d60795417157771680e194a568d661a4218;p=oweals%2Fopenssl.git

No need for custom flag in XTS mode: block length is 1.
---

diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index a6bb0e536b..e3bd2b4982 100644
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -1184,8 +1184,11 @@ static int aes_xts_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 
 #define aes_xts_cleanup NULL
 
-BLOCK_CIPHER_custom(NID_aes,128,1,16,xts,XTS,EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS)
-BLOCK_CIPHER_custom(NID_aes,256,1,16,xts,XTS,EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS)
+#define XTS_FLAGS	(EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CUSTOM_IV \
+			 | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CTRL_INIT)
+
+BLOCK_CIPHER_custom(NID_aes,128,1,16,xts,XTS,EVP_CIPH_FLAG_FIPS|XTS_FLAGS)
+BLOCK_CIPHER_custom(NID_aes,256,1,16,xts,XTS,EVP_CIPH_FLAG_FIPS|XTS_FLAGS)
 
 static int aes_ccm_ctrl(EVP_CIPHER_CTX *c, int type, int arg, void *ptr)
 	{