diff options
| author | jsing <> | 2014-05-08 15:29:00 +0000 |
|---|---|---|
| committer | jsing <> | 2014-05-08 15:29:00 +0000 |
| commit | 1a5256f53dfa946a979facbb0d9d4775fa9d6bfe (patch) | |
| tree | a84efdd1e8722781bc1f88c0ac708e9e14e1a11e /src/lib/libcrypto/evp/e_des3.c | |
| parent | afa026a20fd107fc700f84f9b2db8b5320e934f1 (diff) | |
| download | openbsd-1a5256f53dfa946a979facbb0d9d4775fa9d6bfe.tar.gz openbsd-1a5256f53dfa946a979facbb0d9d4775fa9d6bfe.tar.bz2 openbsd-1a5256f53dfa946a979facbb0d9d4775fa9d6bfe.zip | |
Nuke OPENSSL_FIPS - having #ifdefs inside a #ifndef for the same thing
is amusing.
ok deraadt@
Diffstat (limited to 'src/lib/libcrypto/evp/e_des3.c')
| -rw-r--r-- | src/lib/libcrypto/evp/e_des3.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/lib/libcrypto/evp/e_des3.c b/src/lib/libcrypto/evp/e_des3.c index ddb069dda5..6463326a78 100644 --- a/src/lib/libcrypto/evp/e_des3.c +++ b/src/lib/libcrypto/evp/e_des3.c | |||
| @@ -65,7 +65,6 @@ | |||
| 65 | #include <openssl/des.h> | 65 | #include <openssl/des.h> |
| 66 | #include <openssl/rand.h> | 66 | #include <openssl/rand.h> |
| 67 | 67 | ||
| 68 | #ifndef OPENSSL_FIPS | ||
| 69 | 68 | ||
| 70 | static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, | 69 | static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, |
| 71 | const unsigned char *iv, int enc); | 70 | const unsigned char *iv, int enc); |
| @@ -315,4 +314,3 @@ EVP_des_ede3(void) | |||
| 315 | return &des_ede3_ecb; | 314 | return &des_ede3_ecb; |
| 316 | } | 315 | } |
| 317 | #endif | 316 | #endif |
| 318 | #endif | ||
