Commit 1c2ac294 authored by Jon Spillett's avatar Jon Spillett
Browse files

Fix potential null pointer dereference in ARIA implementation 



Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4286)
parent 198c42f5

crypto/aria/aria.c

+2 −1
Original line number Diff line number Diff line
@@ -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];