diff options
| -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.11.bb | 4 |
2 files changed, 34 insertions, 1 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 new file mode 100644 index 0000000000..ab55b48b75 --- /dev/null +++ b/meta-oe/recipes-connectivity/iwd/iwd/0001-crypto-Update-l_pkcs5_pbkdf2-call-after-rename.patch | |||
| @@ -0,0 +1,31 @@ | |||
| 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.11.bb index f4a237e033..2205b72fff 100644 --- a/meta-oe/recipes-connectivity/iwd/iwd_1.11.bb +++ b/meta-oe/recipes-connectivity/iwd/iwd_1.11.bb | |||
| @@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" | |||
| 5 | 5 | ||
| 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 | SRCREV = "355c2df97e1adfdaee4a67c1705bd76202384687" | 11 | SRCREV = "355c2df97e1adfdaee4a67c1705bd76202384687" |
| 10 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
| 11 | 13 | ||
