iwd: upgrade 1.11 -> 1.12

0001-crypto-Update-l_pkcs5_pbkdf2-call-after-rename.patch
Removed since this is included in 1.12.

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

2 files changed, 1 insertions, 33 deletions

diff --git a/meta-oe/recipes-connectivity/iwd/iwd/0001-crypto-Update-l_pkcs5_pbkdf2-call-after-rename.patch b/meta-oe/recipes-connectivity/iwd/iwd/0001-crypto-Update-l_pkcs5_pbkdf2-call-after-rename.patch
deleted file mode 100644
index ab55b48b75..0000000000
--- a/meta-oe/recipes-connectivity/iwd/iwd/0001-crypto-Update-l_pkcs5_pbkdf2-call-after-rename.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9389f472bc724abb6c6a8db696efb132215783cc Mon Sep 17 00:00:00 2001
-From: Andrew Zaborowski <andrew.zaborowski@intel.com>
-Date: Thu, 24 Dec 2020 00:22:15 +0100
-Subject: [PATCH] crypto: Update l_pkcs5_pbkdf2 call after rename
-
----
-Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=9ef3d51f8724c9b9f9fd4d4fffcc730f4bb1c806]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
- src/crypto.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/crypto.c b/src/crypto.c
-index f5f8e24d..563f17ce 100644
---- a/src/crypto.c
-+++ b/src/crypto.c
-@@ -552,8 +552,9 @@ int crypto_psk_from_passphrase(const char *passphrase,
-        if (ssid_len == 0 || ssid_len > 32)
-                return -ERANGE;
- 
--       result = l_pkcs5_pbkdf2(L_CHECKSUM_SHA1, passphrase, ssid, ssid_len,
--                               4096, psk, sizeof(psk));
-+       result = l_cert_pkcs5_pbkdf2(L_CHECKSUM_SHA1, passphrase,
-+                                       ssid, ssid_len, 4096,
-+                                       psk, sizeof(psk));
-        if (!result)
-                return -ENOKEY;
- 
--- 
-2.30.0
-
diff --git a/meta-oe/recipes-connectivity/iwd/iwd_1.11.bb b/meta-oe/recipes-connectivity/iwd/iwd_1.12.bb
index 2205b72fff..ccdc65ac6c 100644
--- a/meta-oe/recipes-connectivity/iwd/iwd_1.11.bb
+++ b/meta-oe/recipes-connectivity/iwd/iwd_1.12.bb
@@ -6,9 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09"
 DEPENDS = "ell"
 
 SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \
-           file://0001-crypto-Update-l_pkcs5_pbkdf2-call-after-rename.patch \
           "
-SRCREV = "355c2df97e1adfdaee4a67c1705bd76202384687"
+SRCREV = "bde3e0f6e3364e9c884b6b93a944d8138345b8e5"
 S = "${WORKDIR}/git"
 
 inherit autotools manpages pkgconfig python3native systemd