From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 10 Jun 2011 14:22:42 +0000 (+0000)
Subject: Disable GCM, CCM, XTS outside FIPS mode this will be updated
X-Git-Tag: OpenSSL_1_0_1-beta1~247
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7c402e5af332b6e1ee694dff1cdcafea381de508;p=oweals%2Fopenssl.git

Disable GCM, CCM, XTS outside FIPS mode this will be updated
when backported.
---

diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h
index a94f845e93..0a0fc329d0 100644
--- a/crypto/evp/evp.h
+++ b/crypto/evp/evp.h
@@ -767,9 +767,11 @@ const EVP_CIPHER *EVP_aes_128_cfb128(void);
 # define EVP_aes_128_cfb EVP_aes_128_cfb128
 const EVP_CIPHER *EVP_aes_128_ofb(void);
 const EVP_CIPHER *EVP_aes_128_ctr(void);
+#ifdef OPENSSL_FIPS
 const EVP_CIPHER *EVP_aes_128_ccm(void);
 const EVP_CIPHER *EVP_aes_128_gcm(void);
 const EVP_CIPHER *EVP_aes_128_xts(void);
+#endif
 const EVP_CIPHER *EVP_aes_192_ecb(void);
 const EVP_CIPHER *EVP_aes_192_cbc(void);
 const EVP_CIPHER *EVP_aes_192_cfb1(void);
@@ -778,8 +780,10 @@ const EVP_CIPHER *EVP_aes_192_cfb128(void);
 # define EVP_aes_192_cfb EVP_aes_192_cfb128
 const EVP_CIPHER *EVP_aes_192_ofb(void);
 const EVP_CIPHER *EVP_aes_192_ctr(void);
+#ifdef OPENSSL_FIPS
 const EVP_CIPHER *EVP_aes_192_ccm(void);
 const EVP_CIPHER *EVP_aes_192_gcm(void);
+#endif
 const EVP_CIPHER *EVP_aes_256_ecb(void);
 const EVP_CIPHER *EVP_aes_256_cbc(void);
 const EVP_CIPHER *EVP_aes_256_cfb1(void);
@@ -788,10 +792,12 @@ const EVP_CIPHER *EVP_aes_256_cfb128(void);
 # define EVP_aes_256_cfb EVP_aes_256_cfb128
 const EVP_CIPHER *EVP_aes_256_ofb(void);
 const EVP_CIPHER *EVP_aes_256_ctr(void);
+#ifdef OPENSSL_FIPS
 const EVP_CIPHER *EVP_aes_256_ccm(void);
 const EVP_CIPHER *EVP_aes_256_gcm(void);
 const EVP_CIPHER *EVP_aes_256_xts(void);
 #endif
+#endif
 #ifndef OPENSSL_NO_CAMELLIA
 const EVP_CIPHER *EVP_camellia_128_ecb(void);
 const EVP_CIPHER *EVP_camellia_128_cbc(void);