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

Fix potential null pointer dereference in ARIA implementation

Browse source 
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4286)
This commit is contained in:
Jon Spillett 2017-08-30 14:04:08 +10:00
parent 198c42f5af
commit 1c2ac29472
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
crypto/aria/aria.c
View file

@ -542,7 +542,7 @@ int aria_set_encrypt_key(const unsigned char *userKey, const int bits,
uint32_t w0[4], w1[4], w2[4], w3[4]; uint32_t w0[4], w1[4], w2[4], w3[4];
const uint32_t *ck; const uint32_t *ck;
ARIA_u128 *rk = key->rd_key; ARIA_u128 *rk;
int Nr = (bits + 256) / 32; int Nr = (bits + 256) / 32;
if (userKey == NULL || key == NULL) { if (userKey == NULL || key == NULL) {
@ -552,6 +552,7 @@ int aria_set_encrypt_key(const unsigned char *userKey, const int bits,
return -2; return -2;
} }
rk = key->rd_key;
key->rounds = Nr; key->rounds = Nr;
ck = &Key_RC[(bits - 128) / 64][0]; ck = &Key_RC[(bits - 128) / 64][0];