[openssl-commits] [openssl] master update

[paul.dale at oracle.com]

The branch master has been updated
       via  1c2ac294721b636665aa7d62f5e3f843d3b1ac71 (commit)
      from  198c42f5af0d2cc0eb4789c7597b68b6b10cc97a (commit)


- Log -----------------------------------------------------------------
commit 1c2ac294721b636665aa7d62f5e3f843d3b1ac71
Author: Jon Spillett <jon.spillett at oracle.com>
Date:   Wed Aug 30 14:04:08 2017 +1000

    Fix potential null pointer dereference in ARIA implementation
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4286)

-----------------------------------------------------------------------

Summary of changes:
 crypto/aria/aria.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crypto/aria/aria.c b/crypto/aria/aria.c
index a3c31d6..a1903d9 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];