[openssl-commits] [openssl] master update

[paul.dale at oracle.com]

The branch master has been updated
       via  3907872f7234744b478499f42a8d151ca89be64d (commit)
      from  ccb76685e0dcdeefea11f21f07b06f8faf3656aa (commit)


- Log -----------------------------------------------------------------
commit 3907872f7234744b478499f42a8d151ca89be64d
Author: Pauli <paul.dale at oracle.com>
Date:   Fri Sep 1 08:56:54 2017 +1000

    Fix potential null problem.
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4313)

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

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

diff --git a/crypto/aria/aria.c b/crypto/aria/aria.c
index a1903d9..293bcc7 100644
--- a/crypto/aria/aria.c
+++ b/crypto/aria/aria.c
@@ -473,13 +473,13 @@ void aria_encrypt(const unsigned char *in, unsigned char *out,
 {
     register uint32_t reg0, reg1, reg2, reg3;
     int Nr;
-
-    const ARIA_u128 *rk = key->rd_key;
+    const ARIA_u128 *rk;
 
     if (in == NULL || out == NULL || key == NULL) {
         return;
     }
 
+    rk = key->rd_key;
     Nr = key->rounds;
 
     if (Nr != 12 && Nr != 14 && Nr != 16) {