X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fevp%2Fp_seal.c;h=8cc8fcb0bd058e4c4022fdceefde0e0c2e5e379f;hp=ba2dd657aba8e639a91cf227f82104690258399f;hb=c173d09c566e3a3a93edf080e983c08ea9cf6407;hpb=581f1c84940d77451c2592e9fa470893f6c3c3eb diff --git a/crypto/evp/p_seal.c b/crypto/evp/p_seal.c index ba2dd657ab..8cc8fcb0bd 100644 --- a/crypto/evp/p_seal.c +++ b/crypto/evp/p_seal.c @@ -76,9 +76,10 @@ int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, unsigned char **ek EVP_CIPHER_CTX_init(ctx); if(!EVP_EncryptInit_ex(ctx,type,NULL,NULL,NULL)) return 0; } - if (npubk <= 0) return(0); - if (RAND_bytes(key,EVP_MAX_KEY_LENGTH) <= 0) - return(0); + if ((npubk <= 0) || !pubk) + return 1; + if (EVP_CIPHER_CTX_rand_key(ctx, key) <= 0) + return 0; if (EVP_CIPHER_CTX_iv_length(ctx)) RAND_pseudo_bytes(iv,EVP_CIPHER_CTX_iv_length(ctx)); @@ -105,8 +106,10 @@ int inl; } */ -void EVP_SealFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) +int EVP_SealFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) { - EVP_EncryptFinal_ex(ctx,out,outl); + int i; + i = EVP_EncryptFinal_ex(ctx,out,outl); EVP_EncryptInit_ex(ctx,NULL,NULL,NULL,NULL); + return i; }