X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fevp%2Fe_null.c;h=9ca12ee2439455b24e5941efc93eda5f919b97c6;hb=9587429fa07a34066107e926fbc8708220f058fa;hp=698a8e379c9ba8d2cee6c4255cbad2a085e7ddfb;hpb=41e455bfc43b9815f5b6d7498601fdd508c80dc2;p=oweals%2Fopenssl.git diff --git a/crypto/evp/e_null.c b/crypto/evp/e_null.c index 698a8e379c..9ca12ee243 100644 --- a/crypto/evp/e_null.c +++ b/crypto/evp/e_null.c @@ -64,18 +64,19 @@ 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, - 0, + EVP_CIPH_FLAG_FIPS, null_init_key, null_cipher, NULL, 0, NULL, NULL, + NULL, NULL }; @@ -92,10 +93,9 @@ 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; } -