Implement Camellia_set_key properly for FIPS builds.

[openssl.git] / crypto / camellia / cmll_misc.c

diff --git a/crypto/camellia/cmll_misc.c b/crypto/camellia/cmll_misc.c
index 664583ff5de355be6d3cd979401153ee91069a8b..f44d48564c2a28a2efd9c84857e73ca0574c60c7 100644 (file)
--- a/crypto/camellia/cmll_misc.c
+++ b/crypto/camellia/cmll_misc.c
@@ -56,16 +56,8 @@
 
 const char CAMELLIA_version[]="CAMELLIA" OPENSSL_VERSION_PTEXT;
 
-int Camellia_set_key(const unsigned char *userKey, const int bits,
-       CAMELLIA_KEY *key)
-#ifdef OPENSSL_FIPS
-       {
-       fips_cipher_abort(Camellia);
-       return private_Camellia_set_key(userKey, bits, key);
-       }
 int private_Camellia_set_key(const unsigned char *userKey, const int bits,
        CAMELLIA_KEY *key)
-#endif
        {
        if(!userKey || !key)
                return -1;