diff options
author | Wang Mingyu <wangmy@cn.fujitsu.com> | 2021-02-28 22:31:00 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-02-28 10:20:43 -0800 |
commit | 70a6cce8d8b15fcad77b35a551e10e7390ad7a6c (patch) | |
tree | fd506e2a18fca439825b0cbb75b0d3ecc1e4bfa0 /meta-oe/recipes-connectivity/iwd | |
parent | e80d14dc55f909a60d4bee810c0b9b0377bbf59e (diff) | |
download | meta-openembedded-70a6cce8d8b15fcad77b35a551e10e7390ad7a6c.tar.gz |
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>
Diffstat (limited to 'meta-oe/recipes-connectivity/iwd')
-rw-r--r-- | meta-oe/recipes-connectivity/iwd/iwd/0001-crypto-Update-l_pkcs5_pbkdf2-call-after-rename.patch | 31 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/iwd/iwd_1.12.bb (renamed from meta-oe/recipes-connectivity/iwd/iwd_1.11.bb) | 3 |
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 ab55b48b7..000000000 --- a/meta-oe/recipes-connectivity/iwd/iwd/0001-crypto-Update-l_pkcs5_pbkdf2-call-after-rename.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 9389f472bc724abb6c6a8db696efb132215783cc Mon Sep 17 00:00:00 2001 | ||
2 | From: Andrew Zaborowski <andrew.zaborowski@intel.com> | ||
3 | Date: Thu, 24 Dec 2020 00:22:15 +0100 | ||
4 | Subject: [PATCH] crypto: Update l_pkcs5_pbkdf2 call after rename | ||
5 | |||
6 | --- | ||
7 | Upstream-Status: Backport [https://git.kernel.org/pub/scm/network/wireless/iwd.git/commit/?id=9ef3d51f8724c9b9f9fd4d4fffcc730f4bb1c806] | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | |||
10 | src/crypto.c | 5 +++-- | ||
11 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/src/crypto.c b/src/crypto.c | ||
14 | index f5f8e24d..563f17ce 100644 | ||
15 | --- a/src/crypto.c | ||
16 | +++ b/src/crypto.c | ||
17 | @@ -552,8 +552,9 @@ int crypto_psk_from_passphrase(const char *passphrase, | ||
18 | if (ssid_len == 0 || ssid_len > 32) | ||
19 | return -ERANGE; | ||
20 | |||
21 | - result = l_pkcs5_pbkdf2(L_CHECKSUM_SHA1, passphrase, ssid, ssid_len, | ||
22 | - 4096, psk, sizeof(psk)); | ||
23 | + result = l_cert_pkcs5_pbkdf2(L_CHECKSUM_SHA1, passphrase, | ||
24 | + ssid, ssid_len, 4096, | ||
25 | + psk, sizeof(psk)); | ||
26 | if (!result) | ||
27 | return -ENOKEY; | ||
28 | |||
29 | -- | ||
30 | 2.30.0 | ||
31 | |||
diff --git a/meta-oe/recipes-connectivity/iwd/iwd_1.11.bb b/meta-oe/recipes-connectivity/iwd/iwd_1.12.bb index 2205b72ff..ccdc65ac6 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" | |||
6 | DEPENDS = "ell" | 6 | DEPENDS = "ell" |
7 | 7 | ||
8 | SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \ | 8 | SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \ |
9 | file://0001-crypto-Update-l_pkcs5_pbkdf2-call-after-rename.patch \ | ||
10 | " | 9 | " |
11 | SRCREV = "355c2df97e1adfdaee4a67c1705bd76202384687" | 10 | SRCREV = "bde3e0f6e3364e9c884b6b93a944d8138345b8e5" |
12 | S = "${WORKDIR}/git" | 11 | S = "${WORKDIR}/git" |
13 | 12 | ||
14 | inherit autotools manpages pkgconfig python3native systemd | 13 | inherit autotools manpages pkgconfig python3native systemd |