diff options
Diffstat (limited to 'lib/libssl/src/crypto/camellia/cmll_misc.c')
| -rw-r--r-- | lib/libssl/src/crypto/camellia/cmll_misc.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/lib/libssl/src/crypto/camellia/cmll_misc.c b/lib/libssl/src/crypto/camellia/cmll_misc.c index f1047b54e03..2cd7aba9bbd 100644 --- a/lib/libssl/src/crypto/camellia/cmll_misc.c +++ b/lib/libssl/src/crypto/camellia/cmll_misc.c @@ -52,11 +52,24 @@ #include <openssl/opensslv.h> #include <openssl/camellia.h> #include "cmll_locl.h" +#include <openssl/crypto.h> +#ifdef OPENSSL_FIPS +#include <openssl/fips.h> +#endif 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 + { + if (FIPS_mode()) + FIPS_BAD_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) { |