summaryrefslogtreecommitdiffstats
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:55 +0200
commitecbbb373edf7be017e546be2443e6c422cb9c220 (patch)
tree26f620784cb5b5b5c86e6926ff7d77c40efcae25
parentf6e22f0956a1d6ad28d007f80fc9cf4dec51d462 (diff)
downloadopenwrt-ecbbb373edf7be017e546be2443e6c422cb9c220.tar.gz
openwrt-ecbbb373edf7be017e546be2443e6c422cb9c220.tar.bz2
openwrt-ecbbb373edf7be017e546be2443e6c422cb9c220.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) (cherry picked from commit 75cbd8de006698a766126da682d8ae621bc7b0d4)
-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;