summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/camellia/cmll_utl.c
diff options
context:
space:
mode:
authortedu <>2014-04-15 20:06:10 +0000
committertedu <>2014-04-15 20:06:10 +0000
commitf88d9acb16e601adf96b4de4b1041d52d0d846da (patch)
tree11be20c8110348001494179db4f9b0b67ce149ba /src/lib/libcrypto/camellia/cmll_utl.c
parente3275129dc02b842088cee9974244d4933cd72c6 (diff)
downloadopenbsd-f88d9acb16e601adf96b4de4b1041d52d0d846da.tar.gz
openbsd-f88d9acb16e601adf96b4de4b1041d52d0d846da.tar.bz2
openbsd-f88d9acb16e601adf96b4de4b1041d52d0d846da.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.c3
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 @@
57int Camellia_set_key(const unsigned char *userKey, const int bits, 57int 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 }