wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Coverity CID 1444956: Integer handling issues

Browse source 
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8888)
This commit is contained in:
Pauli 2019-05-07 10:55:39 +10:00
parent 21d9856986
commit 6521cb0319
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
crypto/evp/e_des3.c
View file

@ -280,15 +280,17 @@ static int des3_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
{ {
DES_cblock *deskey = ptr; DES_cblock *deskey = ptr;
int kl;
switch (type) { switch (type) {
case EVP_CTRL_RAND_KEY: case EVP_CTRL_RAND_KEY:
if (RAND_priv_bytes(ptr, EVP_CIPHER_CTX_key_length(ctx)) <= 0) kl = EVP_CIPHER_CTX_key_length(ctx);
if (kl < 0 || RAND_priv_bytes(ptr, kl) <= 0)
return 0; return 0;
DES_set_odd_parity(deskey); DES_set_odd_parity(deskey);
if (EVP_CIPHER_CTX_key_length(ctx) >= 16) if (kl >= 16)
DES_set_odd_parity(deskey + 1); DES_set_odd_parity(deskey + 1);
if (EVP_CIPHER_CTX_key_length(ctx) >= 24) if (kl >= 24)
DES_set_odd_parity(deskey + 2); DES_set_odd_parity(deskey + 2);
return 1; return 1;