aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEneas U de Queiroz <cotequeiroz@gmail.com>2022-04-13 10:30:15 -0300
committerPetr Štetiar <ynezz@true.cz>2022-04-20 12:38:21 +0200
commit75cbd8de006698a766126da682d8ae621bc7b0d4 (patch)
treef59170ec57fa45e907ead7cf57ff958cf2f09b54
parent1418439da9ed2dbd4b097298c51ee70629fe10d3 (diff)
downloadupstream-75cbd8de006698a766126da682d8ae621bc7b0d4.tar.gz
upstream-75cbd8de006698a766126da682d8ae621bc7b0d4.tar.bz2
upstream-75cbd8de006698a766126da682d8ae621bc7b0d4.zip
wolfssl: fix compilation with /dev/crypto
This is trivial fix of a duplicate definition of 'int ret'. Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com> (cherry picked from commit df622768da10f36ceeb20346b4c4ee4eb9a8a9ad)
-rw-r--r--package/libs/wolfssl/patches/400-wolfcrypt-src-port-devcrypto-devcrypto_aes.c-remove-.patch19
1 files changed, 19 insertions, 0 deletions
diff --git a/package/libs/wolfssl/patches/400-wolfcrypt-src-port-devcrypto-devcrypto_aes.c-remove-.patch b/package/libs/wolfssl/patches/400-wolfcrypt-src-port-devcrypto-devcrypto_aes.c-remove-.patch
new file mode 100644
index 0000000000..3c0c0a07af
--- /dev/null
+++ b/package/libs/wolfssl/patches/400-wolfcrypt-src-port-devcrypto-devcrypto_aes.c-remove-.patch
@@ -0,0 +1,19 @@
+From 096889927d9528d4fbeb3aab56d1fe8225d2e7ec Mon Sep 17 00:00:00 2001
+From: Daniel Pouzzner <douzzer@wolfssl.com>
+Date: Thu, 14 Apr 2022 20:23:31 -0500
+Subject: [PATCH] wolfcrypt/src/port/devcrypto/devcrypto_aes.c: remove
+ redundant "int ret" in wc_AesCtrEncrypt() (supersedes #5052).
+
+
+diff --git a/wolfcrypt/src/port/devcrypto/devcrypto_aes.c b/wolfcrypt/src/port/devcrypto/devcrypto_aes.c
+index 3bc1d5bb1..28e145e27 100644
+--- a/wolfcrypt/src/port/devcrypto/devcrypto_aes.c
++++ b/wolfcrypt/src/port/devcrypto/devcrypto_aes.c
+@@ -208,7 +208,6 @@ int wc_AesCtrEncrypt(Aes* aes, byte* out, const byte* in, word32 sz)
+ int ret;
+ struct crypt_op crt;
+ byte* tmp;
+- int ret;
+
+ if (aes == NULL || out == NULL || in == NULL) {
+ return BAD_FUNC_ARG;