diff options
author | 2019-04-12 11:27:57 +0800 | |
---|---|---|
committer | 2019-04-12 13:37:11 +0100 | |
commit | 83faaf7b2a5f4fc4ae504b300134409e90389770 (patch) | |
tree | a3d47b1de7f450ac063c0fab44bfc1f654789729 /meta/recipes-support/nettle/nettle-3.4.1/0001-nettle-pbkdf2.c-change-the-initialization-for-salt.patch | |
parent | c574aaf30c82ad397c0a6567b3cb52e7fb5d5829 (diff) | |
download | openembedded-core-contrib-83faaf7b2a5f4fc4ae504b300134409e90389770.tar.gz |
nettle: fix ptest failure
Remove dlopen-test.patch which originally used
to fix the test dlopen-test, but autually the
patch didn't resolve the issue as dlopen-test.patch
supposes the file /usr/lib/libnettle.so exists.
Instead deploy ${D}${PTEST_PATH}/libnettle.so to
fix the dlopen-test failure.
Update the initialization for the salt to fix
below Segmentation fault and also nettle-pbkdf2-test
failure.
# echo -n passwd| nettle-pbkdf2 -i 1 -l 16 salt
[65534.886509] nettle-pbkdf2[708]: segfault at 1f594260 ip 00007f3332256998 sp 00007fff60d44410 error 4 in libnettle.so.6.5[7f3332244000+1d00]
[65534.887525] Code: e8 6d db fe ff 44 01 6d 68 48 83 c4 08 5b 5d 41 5c 41 5d 41 5e 41 5f c3 66 2e 0f 1f 84 00 00 00 00 00 49 89 dc e9 68 ff f
Segmentation fault
Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/nettle/nettle-3.4.1/0001-nettle-pbkdf2.c-change-the-initialization-for-salt.patch')
-rw-r--r-- | meta/recipes-support/nettle/nettle-3.4.1/0001-nettle-pbkdf2.c-change-the-initialization-for-salt.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-support/nettle/nettle-3.4.1/0001-nettle-pbkdf2.c-change-the-initialization-for-salt.patch b/meta/recipes-support/nettle/nettle-3.4.1/0001-nettle-pbkdf2.c-change-the-initialization-for-salt.patch new file mode 100644 index 0000000000..713823e294 --- /dev/null +++ b/meta/recipes-support/nettle/nettle-3.4.1/0001-nettle-pbkdf2.c-change-the-initialization-for-salt.patch @@ -0,0 +1,39 @@ +From 7510ee2877368464ecce7de515ce056e08c75245 Mon Sep 17 00:00:00 2001 +From: Mingli Yu <Mingli.Yu@windriver.com> +Date: Fri, 12 Apr 2019 10:30:14 +0800 +Subject: [PATCH] nettle-pbkdf2.c: change the initialization for salt + +use malloc and strncpy altogether to replace +strdup for salt initialization to fix below +Segmentation fault: + # echo -n passwd| nettle-pbkdf2 -i 1 -l 16 salt + [65534.886509] nettle-pbkdf2[708]: segfault at 1f594260 ip 00007f3332256998 sp 00007fff60d44410 error 4 in libnettle.so.6.5[7f3332244000+1d00] + [65534.887525] Code: e8 6d db fe ff 44 01 6d 68 48 83 c4 08 5b 5d 41 5c 41 5d 41 5e 41 5f c3 66 2e 0f 1f 84 00 00 00 00 00 49 89 dc e9 68 ff f + Segmentation fault + +Upstream-Status: Submitted[http://lists.lysator.liu.se/pipermail/nettle-bugs/2019/007467.html] + +Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> +--- + tools/nettle-pbkdf2.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/tools/nettle-pbkdf2.c b/tools/nettle-pbkdf2.c +index 1f0a301..000acd3 100644 +--- a/tools/nettle-pbkdf2.c ++++ b/tools/nettle-pbkdf2.c +@@ -141,7 +141,10 @@ main (int argc, char **argv) + return EXIT_FAILURE; + } + +- salt = strdup (argv[0]); ++ salt = malloc (strlen(argv[0]) + 1); ++ if (! salt) ++ die ("Failed to allocate memory for salt\n"); ++ strncpy(salt, argv[0], sizeof(salt) - 1); + salt_length = strlen(argv[0]); + + if (hex_salt) +-- +2.7.4 + |