remove FIPS mode support. people who require FIPS can buy something that

meets their needs, but dumping it in here only penalizes the rest of us.
ok beck deraadt

2 files changed, 0 insertions, 7 deletions

diff --git a/src/lib/libcrypto/camellia/camellia.h b/src/lib/libcrypto/camellia/camellia.h
index 67911e0adf..cf0457dd97 100644
--- a/src/lib/libcrypto/camellia/camellia.h
+++ b/src/lib/libcrypto/camellia/camellia.h
@@ -88,10 +88,6 @@ struct camellia_key_st
         };
 typedef struct camellia_key_st CAMELLIA_KEY;
 
-#ifdef OPENSSL_FIPS
-int private_Camellia_set_key(const unsigned char *userKey, const int bits,
-        CAMELLIA_KEY *key);
-#endif
 int Camellia_set_key(const unsigned char *userKey, const int bits,
         CAMELLIA_KEY *key);
 
diff --git a/src/lib/libcrypto/camellia/cmll_utl.c b/src/lib/libcrypto/camellia/cmll_utl.c
index 7a35711ec1..b88a996a3f 100644
--- a/src/lib/libcrypto/camellia/cmll_utl.c
+++ b/src/lib/libcrypto/camellia/cmll_utl.c
@@ -57,8 +57,5 @@
 int Camellia_set_key(const unsigned char *userKey, const int bits,
         CAMELLIA_KEY *key)
         {
-#ifdef OPENSSL_FIPS
-        fips_cipher_abort(Camellia);
-#endif
         return private_Camellia_set_key(userKey, bits, key);
         }