Index: openssl/crypto/evp/e_null.c |
=================================================================== |
--- openssl/crypto/evp/e_null.c (revision 105093) |
+++ openssl/crypto/evp/e_null.c (working copy) |
@@ -64,12 +64,12 @@ |
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 +93,10 @@ |
} |
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; |
} |