diff options
| author | djm <> | 2012-10-13 21:23:50 +0000 |
|---|---|---|
| committer | djm <> | 2012-10-13 21:23:50 +0000 |
| commit | 228cae30b117c2493f69ad3c195341cd6ec8d430 (patch) | |
| tree | 29ff00b10d52c0978077c4fd83c33b065bade73e /src/lib/libcrypto/evp/e_des3.c | |
| parent | 731838c66b52c0ae5888333005b74115a620aa96 (diff) | |
| download | openbsd-228cae30b117c2493f69ad3c195341cd6ec8d430.tar.gz openbsd-228cae30b117c2493f69ad3c195341cd6ec8d430.tar.bz2 openbsd-228cae30b117c2493f69ad3c195341cd6ec8d430.zip | |
import OpenSSL-1.0.1c
Diffstat (limited to 'src/lib/libcrypto/evp/e_des3.c')
| -rw-r--r-- | src/lib/libcrypto/evp/e_des3.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/libcrypto/evp/e_des3.c b/src/lib/libcrypto/evp/e_des3.c index 3232cfe024..1e69972662 100644 --- a/src/lib/libcrypto/evp/e_des3.c +++ b/src/lib/libcrypto/evp/e_des3.c | |||
| @@ -65,6 +65,8 @@ | |||
| 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 | static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, | 70 | static int des_ede_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, |
| 69 | const unsigned char *iv,int enc); | 71 | const unsigned char *iv,int enc); |
| 70 | 72 | ||
| @@ -311,3 +313,4 @@ const EVP_CIPHER *EVP_des_ede3(void) | |||
| 311 | return &des_ede3_ecb; | 313 | return &des_ede3_ecb; |
| 312 | } | 314 | } |
| 313 | #endif | 315 | #endif |
| 316 | #endif | ||
