summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/aes
diff options
context:
space:
mode:
authortedu <>2014-04-15 20:06:10 +0000
committertedu <>2014-04-15 20:06:10 +0000
commit3c7d2178681a2741a8cc8a042cb2ea6ee28528b8 (patch)
tree11be20c8110348001494179db4f9b0b67ce149ba /src/lib/libcrypto/aes
parent4c8a9a73429ac4a1d79f4bab6a397df643934861 (diff)
downloadopenbsd-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/aes')
-rw-r--r--src/lib/libcrypto/aes/aes_misc.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/lib/libcrypto/aes/aes_misc.c b/src/lib/libcrypto/aes/aes_misc.c
index d666c06409..9380abc46c 100644
--- a/src/lib/libcrypto/aes/aes_misc.c
+++ b/src/lib/libcrypto/aes/aes_misc.c
@@ -71,9 +71,6 @@ int
71AES_set_encrypt_key(const unsigned char *userKey, const int bits, 71AES_set_encrypt_key(const unsigned char *userKey, const int bits,
72 AES_KEY *key) 72 AES_KEY *key)
73{ 73{
74#ifdef OPENSSL_FIPS
75 fips_cipher_abort(AES);
76#endif
77 return private_AES_set_encrypt_key(userKey, bits, key); 74 return private_AES_set_encrypt_key(userKey, bits, key);
78} 75}
79 76
@@ -81,8 +78,5 @@ int
81AES_set_decrypt_key(const unsigned char *userKey, const int bits, 78AES_set_decrypt_key(const unsigned char *userKey, const int bits,
82 AES_KEY *key) 79 AES_KEY *key)
83{ 80{
84#ifdef OPENSSL_FIPS
85 fips_cipher_abort(AES);
86#endif
87 return private_AES_set_decrypt_key(userKey, bits, key); 81 return private_AES_set_decrypt_key(userKey, bits, key);
88} 82}