summaryrefslogtreecommitdiffstats
path: root/crypto/aria
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2017-09-01 08:56:54 +1000
committerPauli <paul.dale@oracle.com>2017-09-01 09:30:18 +1000
commit3907872f7234744b478499f42a8d151ca89be64d (patch)
tree9d253f7a059b232b1c809a1907ac18a7bcbe8e2a /crypto/aria
parentccb76685e0dcdeefea11f21f07b06f8faf3656aa (diff)
Fix potential null problem.
Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/4313)
Diffstat (limited to 'crypto/aria')
-rw-r--r--crypto/aria/aria.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/aria/aria.c b/crypto/aria/aria.c
index a1903d9b2d..293bcc72bd 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) {