diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-07-11 23:31:36 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2012-07-11 23:31:36 +0000 |
| commit | 0758ab5ea778e4ba36d2150af1bba602a48d6467 (patch) | |
| tree | 0c30591ac90cb5e07a0763793709fd1056b67f57 /crypto/evp/e_null.c | |
| parent | 2b8b5455829304396e38200c205612c4dc57c052 (diff) | |
Diffstat (limited to 'crypto/evp/e_null.c')
| -rw-r--r-- | crypto/evp/e_null.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/crypto/evp/e_null.c b/crypto/evp/e_null.c index 0872d733e475..f0c1f78b5fec 100644 --- a/crypto/evp/e_null.c +++ b/crypto/evp/e_null.c @@ -61,15 +61,17 @@ #include <openssl/evp.h> #include <openssl/objects.h> +#ifndef OPENSSL_FIPS + static int null_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, const unsigned char *iv,int enc); static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, - const unsigned char *in, unsigned int inl); + const unsigned char *in, size_t inl); static const EVP_CIPHER n_cipher= { NID_undef, 1,0,0, - EVP_CIPH_FLAG_FIPS, + 0, null_init_key, null_cipher, NULL, @@ -93,10 +95,10 @@ static int null_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, } static int null_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, - const unsigned char *in, unsigned int inl) + const unsigned char *in, size_t inl) { if (in != out) - memcpy((char *)out,(const char *)in,(size_t)inl); + memcpy((char *)out,(const char *)in,inl); return 1; } - +#endif |