projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ccb7668
)
Fix potential null problem.
author
Pauli
<paul.dale@oracle.com>
Thu, 31 Aug 2017 22:56:54 +0000
(08:56 +1000)
committer
Pauli
<paul.dale@oracle.com>
Thu, 31 Aug 2017 23:30:18 +0000
(09:30 +1000)
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4313)
crypto/aria/aria.c
patch
|
blob
|
history
diff --git
a/crypto/aria/aria.c
b/crypto/aria/aria.c
index a1903d9b2df502f3a6dac3770a9807287ae365e5..293bcc72bd03bcb4d634fa2888e37bc938540aaa 100644
(file)
--- 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) {