diff options
author | tedu <> | 2014-04-15 20:06:10 +0000 |
---|---|---|
committer | tedu <> | 2014-04-15 20:06:10 +0000 |
commit | 3c7d2178681a2741a8cc8a042cb2ea6ee28528b8 (patch) | |
tree | 11be20c8110348001494179db4f9b0b67ce149ba /src/lib/libcrypto/camellia/cmll_utl.c | |
parent | 4c8a9a73429ac4a1d79f4bab6a397df643934861 (diff) | |
download | openbsd-3c7d2178681a2741a8cc8a042cb2ea6ee28528b8.tar.gz openbsd-3c7d2178681a2741a8cc8a042cb2ea6ee28528b8.tar.bz2 openbsd-3c7d2178681a2741a8cc8a042cb2ea6ee28528b8.zip |
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
Diffstat (limited to 'src/lib/libcrypto/camellia/cmll_utl.c')
-rw-r--r-- | src/lib/libcrypto/camellia/cmll_utl.c | 3 |
1 files changed, 0 insertions, 3 deletions
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 @@ | |||
57 | int Camellia_set_key(const unsigned char *userKey, const int bits, | 57 | int Camellia_set_key(const unsigned char *userKey, const int bits, |
58 | CAMELLIA_KEY *key) | 58 | CAMELLIA_KEY *key) |
59 | { | 59 | { |
60 | #ifdef OPENSSL_FIPS | ||
61 | fips_cipher_abort(Camellia); | ||
62 | #endif | ||
63 | return private_Camellia_set_key(userKey, bits, key); | 60 | return private_Camellia_set_key(userKey, bits, key); |
64 | } | 61 | } |