diff options
| author | Pauli <paul.dale@oracle.com> | 2017-09-01 00:56:54 +0200 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2017-09-01 01:30:18 +0200 |
| commit | 3907872f7234744b478499f42a8d151ca89be64d (patch) | |
| tree | 9d253f7a059b232b1c809a1907ac18a7bcbe8e2a /crypto/aria/aria.c | |
| parent | Avoid possible uninitialized variable. (diff) | |
| download | openssl-3907872f7234744b478499f42a8d151ca89be64d.tar.xz openssl-3907872f7234744b478499f42a8d151ca89be64d.zip | |
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/aria.c')
| -rw-r--r-- | crypto/aria/aria.c | 4 |
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) { |