diff options
| author | Jon Spillett <jon.spillett@oracle.com> | 2017-08-30 14:04:08 +1000 |
|---|---|---|
| committer | Jon Spillett <jon.spillett@oracle.com> | 2017-08-30 14:04:08 +1000 |
| commit | 1c2ac294721b636665aa7d62f5e3f843d3b1ac71 (patch) | |
| tree | b50d4fce231bc43ef1ef14802d001d20911b8ada /crypto/aria | |
| parent | 198c42f5af0d2cc0eb4789c7597b68b6b10cc97a (diff) | |
Fix potential null pointer dereference in ARIA implementation
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4286)
Diffstat (limited to 'crypto/aria')
| -rw-r--r-- | crypto/aria/aria.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/aria/aria.c b/crypto/aria/aria.c index a3c31d6b10..a1903d9b2d 100644 --- a/crypto/aria/aria.c +++ b/crypto/aria/aria.c @@ -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]; const uint32_t *ck; - ARIA_u128 *rk = key->rd_key; + ARIA_u128 *rk; int Nr = (bits + 256) / 32; if (userKey == NULL || key == NULL) { @@ -552,6 +552,7 @@ int aria_set_encrypt_key(const unsigned char *userKey, const int bits, return -2; } + rk = key->rd_key; key->rounds = Nr; ck = &Key_RC[(bits - 128) / 64][0]; |