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_null.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_null.c')
| -rw-r--r-- | src/lib/libcrypto/evp/e_null.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/libcrypto/evp/e_null.c b/src/lib/libcrypto/evp/e_null.c index 7cf50e1416..f0c1f78b5f 100644 --- a/src/lib/libcrypto/evp/e_null.c +++ b/src/lib/libcrypto/evp/e_null.c | |||
| @@ -61,6 +61,8 @@ | |||
| 61 | #include <openssl/evp.h> | 61 | #include <openssl/evp.h> |
| 62 | #include <openssl/objects.h> | 62 | #include <openssl/objects.h> |
| 63 | 63 | ||
| 64 | #ifndef OPENSSL_FIPS | ||
| 65 | |||
| 64 | static int null_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, | 66 | static int null_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, |
| 65 | const unsigned char *iv,int enc); | 67 | const unsigned char *iv,int enc); |
| 66 | static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, | 68 | static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, |
| @@ -99,4 +101,4 @@ static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, | |||
| 99 | memcpy((char *)out,(const char *)in,inl); | 101 | memcpy((char *)out,(const char *)in,inl); |
| 100 | return 1; | 102 | return 1; |
| 101 | } | 103 | } |
| 102 | 104 | #endif | |
