projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7f03995
)
Fix declaration inconsistency (Camellia)
author
Hugo Landau
<hlandau@openssl.org>
Wed, 16 Mar 2022 16:32:08 +0000
(16:32 +0000)
committer
Pauli
<pauli@openssl.org>
Fri, 18 Mar 2022 01:29:29 +0000
(12:29 +1100)
Fixes #17911.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17912)
crypto/camellia/camellia.c
patch
|
blob
|
history
diff --git
a/crypto/camellia/camellia.c
b/crypto/camellia/camellia.c
index dcdff810e366ff1104e99aad910fa5dbf136ab26..fc6e84fd436f6863a7c89fa821cd7e50b73d8855 100644
(file)
--- a/
crypto/camellia/camellia.c
+++ b/
crypto/camellia/camellia.c
@@
-499,9
+499,9
@@
void Camellia_DecryptBlock_Rounds(int grandRounds, const u8 ciphertext[],
PUTU32(plaintext + 12, s1);
}
-void Camellia_DecryptBlock(int keyBitLength, const u8
plain
text[],
- const KEY_TABLE_TYPE keyTable, u8
cipher
text[])
+void Camellia_DecryptBlock(int keyBitLength, const u8
cipher
text[],
+ const KEY_TABLE_TYPE keyTable, u8
plain
text[])
{
Camellia_DecryptBlock_Rounds(keyBitLength == 128 ? 3 : 4,
-
plaintext, keyTable, cipher
text);
+
ciphertext, keyTable, plain
text);
}