May 2016 - tor-commits - lists.torproject.org

[tor/maint-0.2.8] Merge branch 'bug19175_028_v2' into maint-0.2.8
by nickm＠torproject.org 25 May '16

25 May '16

commit f2d614c3d93aceac4954f7cd593213a5fcfbb123 Merge: 6d375f1 9cf6af7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 25 16:12:01 2016 -0400 Merge branch 'bug19175_028_v2' into maint-0.2.8 src/or/routerlist.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)

1 0

[tor/master] Merge branch 'bug19175_028_v2' into maint-0.2.8
by nickm＠torproject.org 25 May '16

25 May '16

commit f2d614c3d93aceac4954f7cd593213a5fcfbb123 Merge: 6d375f1 9cf6af7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 25 16:12:01 2016 -0400 Merge branch 'bug19175_028_v2' into maint-0.2.8 src/or/routerlist.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)

1 0

[tor/release-0.2.8] Fold new entries into 0.2.8.3-alpha changelog.
by nickm＠torproject.org 25 May '16

25 May '16

commit 693e48a5a4dc0bd537e00134606268b6b91afce0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 25 10:29:15 2016 -0400 Fold new entries into 0.2.8.3-alpha changelog. --- ChangeLog | 22 +++++++++++++++++++++- changes/bug19161 | 3 --- changes/memarea_overflow | 7 ------- changes/rsa_init_bug | 7 ------- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index c2c2821..04794e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.2.8.3-alpha - 2016-05-?? +Changes in version 0.2.8.3-alpha - 2016-05-2? Tor 0.2.8.3-alpha resolves several bugs, most of them introduced over the course of the 0.2.8 development cycle. It improves the behavior of directory clients, fixes several crash bugs, fixes a gap in compiler @@ -51,6 +51,15 @@ Changes in version 0.2.8.3-alpha - 2016-05-?? IPv6 bridges. Fixes bug 18921; bugfix on 0.2.8.1-alpha. Patch by "teor". + o Major bugfixes (key management): + - If OpenSSL fails to generate an RSA key, do not retain a dangling + pointer to the previous (uninitialized) key value. The impact here + should be limited to a difficult-to-trigger crash, if OpenSSL is + running an engine that makes key generation failures possible, or + if OpenSSL runs out of memory. Fixes bug 19152; bugfix on + 0.2.1.10-alpha. Found by Yuan Jochen Kang, Suman Jana, and + Baishakhi Ray. + o Major bugfixes (testing): - Fix a bug that would block 'make test-network-all' on systems where IPv6 packets were lost. Fixes bug 19008; bugfix on tor-0.2.7.3-rc. @@ -89,6 +98,9 @@ Changes in version 0.2.8.3-alpha - 2016-05-?? - Resolve warnings when building on systems that are concerned with signed char. Fixes bug 18728; bugfix on 0.2.7.2-alpha and 0.2.6.1-alpha. + - When libscrypt.h is found, but no libscrypt library can be linked, + treat libscrypt as absent. Fixes bug 19161; bugfix + on 0.2.6.1-alpha. o Minor bugfixes (client): - Turn all TestingClientBootstrap* into non-testing torrc options. @@ -134,6 +146,14 @@ Changes in version 0.2.8.3-alpha - 2016-05-?? to terminate a pluggable transport because it has already exited. Fixes bug 18686; bugfix on 0.2.5.5-alpha. + o Minor bugfixes (pointer arithmetic): + - Fix a bug in memarea_alloc() that could have resulted in remote + heap write access, if Tor had ever passed an unchecked size to + memarea_alloc(). Fortunately, all the sizes we pass to + memarea_alloc() are pre-checked to be less than 128 kilobytes. + Fixes bug 19150; bugfix on 0.2.1.1-alpha. Bug found by + Guido Vranken. + o Minor bugfixes (relays): - Consider more config options when relays decide whether to regenerate their descriptor. Fixes more of bug 12538; bugfix diff --git a/changes/bug19161 b/changes/bug19161 deleted file mode 100644 index 78c2165..0000000 --- a/changes/bug19161 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes (compilation): - - When libscrypt.h is found, but no libscrypt library can be linked, - treat libscrypt as absent. Fixes bug 19161; bugfix on 0.2.6.1-alpha. diff --git a/changes/memarea_overflow b/changes/memarea_overflow deleted file mode 100644 index 8fdc38c..0000000 --- a/changes/memarea_overflow +++ /dev/null @@ -1,7 +0,0 @@ - o Minor bugfixes (pointer arithmetic): - - Fix a bug in memarea_alloc() that could have resulted in remote heap - write access, if Tor had ever passed an unchecked size to - memarea_alloc(). Fortunately, all the sizes we pass to memarea_alloc() - are pre-checked to be less than 128 kilobytes. Fixes bug 19150; bugfix - on 0.2.1.1-alpha. Bug found by Guido Vranken. - diff --git a/changes/rsa_init_bug b/changes/rsa_init_bug deleted file mode 100644 index 6b5fb4f..0000000 --- a/changes/rsa_init_bug +++ /dev/null @@ -1,7 +0,0 @@ - o Major bugfixes (key management): - - If OpenSSL fails to generate an RSA key, do not retain a dangling pointer - to the previous (uninitialized) key value. The impact here should be - limited to a difficult-to-trigger crash, if OpenSSL is running an - engine that makes key generation failures possible, or if OpenSSL runs - out of memory. Fixes bug 19152; bugfix on 0.2.1.10-alpha. Found by - Yuan Jochen Kang, Suman Jana, and Baishakhi Ray.

1 0

[tor/maint-0.2.8] Merge branch 'bug19161_028_v2' into maint-0.2.8
by nickm＠torproject.org 25 May '16

25 May '16

commit 6d375f17fc6df89e9eaf2b9b69f3d69bb78dfc4d Merge: fdfc528 be3875c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 25 10:17:26 2016 -0400 Merge branch 'bug19161_028_v2' into maint-0.2.8 changes/bug19161 | 3 +++ configure.ac | 1 + src/common/crypto_s2k.c | 2 +- src/test/test_crypto_slow.c | 15 ++++++++------- 4 files changed, 13 insertions(+), 8 deletions(-)

1 0

[tor/maint-0.2.8] Make sure that libscrypt_scrypt actually exists before using it.
by nickm＠torproject.org 25 May '16

25 May '16

commit be3875cda2c45d8cd057c00e0bcc16bef9067d90 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 24 10:28:31 2016 -0400 Make sure that libscrypt_scrypt actually exists before using it. Previously, if the header was present, we'd proceed even if the function wasn't there. Easy fix for bug 19161. A better fix would involve trying harder to find libscrypt_scrypt. --- changes/bug19161 | 3 +++ configure.ac | 1 + src/common/crypto_s2k.c | 2 +- src/test/test_crypto_slow.c | 15 ++++++++------- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/changes/bug19161 b/changes/bug19161 new file mode 100644 index 0000000..78c2165 --- /dev/null +++ b/changes/bug19161 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - When libscrypt.h is found, but no libscrypt library can be linked, + treat libscrypt as absent. Fixes bug 19161; bugfix on 0.2.6.1-alpha. diff --git a/configure.ac b/configure.ac index a487948..59433c2 100644 --- a/configure.ac +++ b/configure.ac @@ -833,6 +833,7 @@ dnl Check for libscrypt if test "x$enable_libscrypt" != "xno"; then AC_CHECK_HEADERS([libscrypt.h]) AC_SEARCH_LIBS(libscrypt_scrypt, [scrypt]) + AC_CHECK_FUNCS([libscrypt_scrypt]) fi dnl ============================================================ diff --git a/src/common/crypto_s2k.c b/src/common/crypto_s2k.c index a9140c7..3bc05f1 100644 --- a/src/common/crypto_s2k.c +++ b/src/common/crypto_s2k.c @@ -19,7 +19,7 @@ #include <openssl/evp.h> -#ifdef HAVE_LIBSCRYPT_H +#if defined(HAVE_LIBSCRYPT_H) && defined(HAVE_LIBSCRYPT_SCRYPT) #define HAVE_SCRYPT #include <libscrypt.h> #endif diff --git a/src/test/test_crypto_slow.c b/src/test/test_crypto_slow.c index 9b39199..6f3e40e 100644 --- a/src/test/test_crypto_slow.c +++ b/src/test/test_crypto_slow.c @@ -10,7 +10,8 @@ #include "crypto_s2k.h" #include "crypto_pwbox.h" -#if defined(HAVE_LIBSCRYPT_H) +#if defined(HAVE_LIBSCRYPT_H) && defined(HAVE_LIBSCRYPT_SCRYPT) +#define HAVE_LIBSCRYPT #include <libscrypt.h> #endif @@ -129,7 +130,7 @@ test_crypto_s2k_general(void *arg) } } -#if defined(HAVE_LIBSCRYPT_H) && defined(HAVE_EVP_PBE_SCRYPT) +#if defined(HAVE_LIBSCRYPT) && defined(HAVE_EVP_PBE_SCRYPT) static void test_libscrypt_eq_openssl(void *arg) { @@ -276,7 +277,7 @@ test_crypto_s2k_errors(void *arg) buf, sizeof(buf), "ABC", 3)); /* Truncated output */ -#ifdef HAVE_LIBSCRYPT_H +#ifdef HAVE_LIBSCRYPT tt_int_op(S2K_TRUNCATED, OP_EQ, secret_to_key_new(buf, 50, &sz, "ABC", 3, 0)); tt_int_op(S2K_TRUNCATED, OP_EQ, secret_to_key_new(buf, 50, &sz, @@ -287,7 +288,7 @@ test_crypto_s2k_errors(void *arg) tt_int_op(S2K_TRUNCATED, OP_EQ, secret_to_key_new(buf, 29, &sz, "ABC", 3, S2K_FLAG_NO_SCRYPT)); -#ifdef HAVE_LIBSCRYPT_H +#ifdef HAVE_LIBSCRYPT tt_int_op(S2K_TRUNCATED, OP_EQ, secret_to_key_make_specifier(buf, 18, 0)); tt_int_op(S2K_TRUNCATED, OP_EQ, secret_to_key_make_specifier(buf, 18, S2K_FLAG_LOW_MEM)); @@ -308,7 +309,7 @@ test_crypto_s2k_errors(void *arg) secret_to_key_derivekey(buf2, sizeof(buf2), buf, 18, "ABC", 3)); -#ifdef HAVE_LIBSCRYPT_H +#ifdef HAVE_LIBSCRYPT /* It's a bad scrypt buffer if N would overflow uint64 */ memset(buf, 0, sizeof(buf)); buf[0] = 2; /* scrypt */ @@ -329,7 +330,7 @@ test_crypto_scrypt_vectors(void *arg) uint8_t spec[64], out[64]; (void)arg; -#ifndef HAVE_LIBSCRYPT_H +#ifndef HAVE_LIBSCRYPT if (1) tt_skip(); #endif @@ -507,7 +508,7 @@ test_crypto_pwbox(void *arg) struct testcase_t slow_crypto_tests[] = { CRYPTO_LEGACY(s2k_rfc2440), -#ifdef HAVE_LIBSCRYPT_H +#ifdef HAVE_LIBSCRYPT { "s2k_scrypt", test_crypto_s2k_general, 0, &passthrough_setup, (void*)"scrypt" }, { "s2k_scrypt_low", test_crypto_s2k_general, 0, &passthrough_setup,

1 0

[tor/master] Make sure that libscrypt_scrypt actually exists before using it.
by nickm＠torproject.org 25 May '16

25 May '16

commit be3875cda2c45d8cd057c00e0bcc16bef9067d90 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 24 10:28:31 2016 -0400 Make sure that libscrypt_scrypt actually exists before using it. Previously, if the header was present, we'd proceed even if the function wasn't there. Easy fix for bug 19161. A better fix would involve trying harder to find libscrypt_scrypt. --- changes/bug19161 | 3 +++ configure.ac | 1 + src/common/crypto_s2k.c | 2 +- src/test/test_crypto_slow.c | 15 ++++++++------- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/changes/bug19161 b/changes/bug19161 new file mode 100644 index 0000000..78c2165 --- /dev/null +++ b/changes/bug19161 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - When libscrypt.h is found, but no libscrypt library can be linked, + treat libscrypt as absent. Fixes bug 19161; bugfix on 0.2.6.1-alpha. diff --git a/configure.ac b/configure.ac index a487948..59433c2 100644 --- a/configure.ac +++ b/configure.ac @@ -833,6 +833,7 @@ dnl Check for libscrypt if test "x$enable_libscrypt" != "xno"; then AC_CHECK_HEADERS([libscrypt.h]) AC_SEARCH_LIBS(libscrypt_scrypt, [scrypt]) + AC_CHECK_FUNCS([libscrypt_scrypt]) fi dnl ============================================================ diff --git a/src/common/crypto_s2k.c b/src/common/crypto_s2k.c index a9140c7..3bc05f1 100644 --- a/src/common/crypto_s2k.c +++ b/src/common/crypto_s2k.c @@ -19,7 +19,7 @@ #include <openssl/evp.h> -#ifdef HAVE_LIBSCRYPT_H +#if defined(HAVE_LIBSCRYPT_H) && defined(HAVE_LIBSCRYPT_SCRYPT) #define HAVE_SCRYPT #include <libscrypt.h> #endif diff --git a/src/test/test_crypto_slow.c b/src/test/test_crypto_slow.c index 9b39199..6f3e40e 100644 --- a/src/test/test_crypto_slow.c +++ b/src/test/test_crypto_slow.c @@ -10,7 +10,8 @@ #include "crypto_s2k.h" #include "crypto_pwbox.h" -#if defined(HAVE_LIBSCRYPT_H) +#if defined(HAVE_LIBSCRYPT_H) && defined(HAVE_LIBSCRYPT_SCRYPT) +#define HAVE_LIBSCRYPT #include <libscrypt.h> #endif @@ -129,7 +130,7 @@ test_crypto_s2k_general(void *arg) } } -#if defined(HAVE_LIBSCRYPT_H) && defined(HAVE_EVP_PBE_SCRYPT) +#if defined(HAVE_LIBSCRYPT) && defined(HAVE_EVP_PBE_SCRYPT) static void test_libscrypt_eq_openssl(void *arg) { @@ -276,7 +277,7 @@ test_crypto_s2k_errors(void *arg) buf, sizeof(buf), "ABC", 3)); /* Truncated output */ -#ifdef HAVE_LIBSCRYPT_H +#ifdef HAVE_LIBSCRYPT tt_int_op(S2K_TRUNCATED, OP_EQ, secret_to_key_new(buf, 50, &sz, "ABC", 3, 0)); tt_int_op(S2K_TRUNCATED, OP_EQ, secret_to_key_new(buf, 50, &sz, @@ -287,7 +288,7 @@ test_crypto_s2k_errors(void *arg) tt_int_op(S2K_TRUNCATED, OP_EQ, secret_to_key_new(buf, 29, &sz, "ABC", 3, S2K_FLAG_NO_SCRYPT)); -#ifdef HAVE_LIBSCRYPT_H +#ifdef HAVE_LIBSCRYPT tt_int_op(S2K_TRUNCATED, OP_EQ, secret_to_key_make_specifier(buf, 18, 0)); tt_int_op(S2K_TRUNCATED, OP_EQ, secret_to_key_make_specifier(buf, 18, S2K_FLAG_LOW_MEM)); @@ -308,7 +309,7 @@ test_crypto_s2k_errors(void *arg) secret_to_key_derivekey(buf2, sizeof(buf2), buf, 18, "ABC", 3)); -#ifdef HAVE_LIBSCRYPT_H +#ifdef HAVE_LIBSCRYPT /* It's a bad scrypt buffer if N would overflow uint64 */ memset(buf, 0, sizeof(buf)); buf[0] = 2; /* scrypt */ @@ -329,7 +330,7 @@ test_crypto_scrypt_vectors(void *arg) uint8_t spec[64], out[64]; (void)arg; -#ifndef HAVE_LIBSCRYPT_H +#ifndef HAVE_LIBSCRYPT if (1) tt_skip(); #endif @@ -507,7 +508,7 @@ test_crypto_pwbox(void *arg) struct testcase_t slow_crypto_tests[] = { CRYPTO_LEGACY(s2k_rfc2440), -#ifdef HAVE_LIBSCRYPT_H +#ifdef HAVE_LIBSCRYPT { "s2k_scrypt", test_crypto_s2k_general, 0, &passthrough_setup, (void*)"scrypt" }, { "s2k_scrypt_low", test_crypto_s2k_general, 0, &passthrough_setup,

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 25 May '16

25 May '16

commit 44ea3dc3311564a9b7f6f67a106be0fa56b38554 Merge: a3ec811 6d375f1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 25 10:21:15 2016 -0400 Merge branch 'maint-0.2.8' changes/bug19161 | 3 +++ configure.ac | 1 + src/common/crypto_s2k.c | 2 +- src/test/test_crypto_slow.c | 15 ++++++++------- 4 files changed, 13 insertions(+), 8 deletions(-)

1 0

[tor/release-0.2.8] Merge branch 'bug19161_028_v2' into maint-0.2.8
by nickm＠torproject.org 25 May '16

25 May '16

commit 6d375f17fc6df89e9eaf2b9b69f3d69bb78dfc4d Merge: fdfc528 be3875c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 25 10:17:26 2016 -0400 Merge branch 'bug19161_028_v2' into maint-0.2.8 changes/bug19161 | 3 +++ configure.ac | 1 + src/common/crypto_s2k.c | 2 +- src/test/test_crypto_slow.c | 15 ++++++++------- 4 files changed, 13 insertions(+), 8 deletions(-)

1 0

[tor/master] Merge branch 'bug19161_028_v2' into maint-0.2.8
by nickm＠torproject.org 25 May '16

25 May '16

commit 6d375f17fc6df89e9eaf2b9b69f3d69bb78dfc4d Merge: fdfc528 be3875c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed May 25 10:17:26 2016 -0400 Merge branch 'bug19161_028_v2' into maint-0.2.8 changes/bug19161 | 3 +++ configure.ac | 1 + src/common/crypto_s2k.c | 2 +- src/test/test_crypto_slow.c | 15 ++++++++------- 4 files changed, 13 insertions(+), 8 deletions(-)

1 0

[tor/release-0.2.8] Make sure that libscrypt_scrypt actually exists before using it.
by nickm＠torproject.org 25 May '16

25 May '16

commit be3875cda2c45d8cd057c00e0bcc16bef9067d90 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 24 10:28:31 2016 -0400 Make sure that libscrypt_scrypt actually exists before using it. Previously, if the header was present, we'd proceed even if the function wasn't there. Easy fix for bug 19161. A better fix would involve trying harder to find libscrypt_scrypt. --- changes/bug19161 | 3 +++ configure.ac | 1 + src/common/crypto_s2k.c | 2 +- src/test/test_crypto_slow.c | 15 ++++++++------- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/changes/bug19161 b/changes/bug19161 new file mode 100644 index 0000000..78c2165 --- /dev/null +++ b/changes/bug19161 @@ -0,0 +1,3 @@ + o Minor bugfixes (compilation): + - When libscrypt.h is found, but no libscrypt library can be linked, + treat libscrypt as absent. Fixes bug 19161; bugfix on 0.2.6.1-alpha. diff --git a/configure.ac b/configure.ac index a487948..59433c2 100644 --- a/configure.ac +++ b/configure.ac @@ -833,6 +833,7 @@ dnl Check for libscrypt if test "x$enable_libscrypt" != "xno"; then AC_CHECK_HEADERS([libscrypt.h]) AC_SEARCH_LIBS(libscrypt_scrypt, [scrypt]) + AC_CHECK_FUNCS([libscrypt_scrypt]) fi dnl ============================================================ diff --git a/src/common/crypto_s2k.c b/src/common/crypto_s2k.c index a9140c7..3bc05f1 100644 --- a/src/common/crypto_s2k.c +++ b/src/common/crypto_s2k.c @@ -19,7 +19,7 @@ #include <openssl/evp.h> -#ifdef HAVE_LIBSCRYPT_H +#if defined(HAVE_LIBSCRYPT_H) && defined(HAVE_LIBSCRYPT_SCRYPT) #define HAVE_SCRYPT #include <libscrypt.h> #endif diff --git a/src/test/test_crypto_slow.c b/src/test/test_crypto_slow.c index 9b39199..6f3e40e 100644 --- a/src/test/test_crypto_slow.c +++ b/src/test/test_crypto_slow.c @@ -10,7 +10,8 @@ #include "crypto_s2k.h" #include "crypto_pwbox.h" -#if defined(HAVE_LIBSCRYPT_H) +#if defined(HAVE_LIBSCRYPT_H) && defined(HAVE_LIBSCRYPT_SCRYPT) +#define HAVE_LIBSCRYPT #include <libscrypt.h> #endif @@ -129,7 +130,7 @@ test_crypto_s2k_general(void *arg) } } -#if defined(HAVE_LIBSCRYPT_H) && defined(HAVE_EVP_PBE_SCRYPT) +#if defined(HAVE_LIBSCRYPT) && defined(HAVE_EVP_PBE_SCRYPT) static void test_libscrypt_eq_openssl(void *arg) { @@ -276,7 +277,7 @@ test_crypto_s2k_errors(void *arg) buf, sizeof(buf), "ABC", 3)); /* Truncated output */ -#ifdef HAVE_LIBSCRYPT_H +#ifdef HAVE_LIBSCRYPT tt_int_op(S2K_TRUNCATED, OP_EQ, secret_to_key_new(buf, 50, &sz, "ABC", 3, 0)); tt_int_op(S2K_TRUNCATED, OP_EQ, secret_to_key_new(buf, 50, &sz, @@ -287,7 +288,7 @@ test_crypto_s2k_errors(void *arg) tt_int_op(S2K_TRUNCATED, OP_EQ, secret_to_key_new(buf, 29, &sz, "ABC", 3, S2K_FLAG_NO_SCRYPT)); -#ifdef HAVE_LIBSCRYPT_H +#ifdef HAVE_LIBSCRYPT tt_int_op(S2K_TRUNCATED, OP_EQ, secret_to_key_make_specifier(buf, 18, 0)); tt_int_op(S2K_TRUNCATED, OP_EQ, secret_to_key_make_specifier(buf, 18, S2K_FLAG_LOW_MEM)); @@ -308,7 +309,7 @@ test_crypto_s2k_errors(void *arg) secret_to_key_derivekey(buf2, sizeof(buf2), buf, 18, "ABC", 3)); -#ifdef HAVE_LIBSCRYPT_H +#ifdef HAVE_LIBSCRYPT /* It's a bad scrypt buffer if N would overflow uint64 */ memset(buf, 0, sizeof(buf)); buf[0] = 2; /* scrypt */ @@ -329,7 +330,7 @@ test_crypto_scrypt_vectors(void *arg) uint8_t spec[64], out[64]; (void)arg; -#ifndef HAVE_LIBSCRYPT_H +#ifndef HAVE_LIBSCRYPT if (1) tt_skip(); #endif @@ -507,7 +508,7 @@ test_crypto_pwbox(void *arg) struct testcase_t slow_crypto_tests[] = { CRYPTO_LEGACY(s2k_rfc2440), -#ifdef HAVE_LIBSCRYPT_H +#ifdef HAVE_LIBSCRYPT { "s2k_scrypt", test_crypto_s2k_general, 0, &passthrough_setup, (void*)"scrypt" }, { "s2k_scrypt_low", test_crypto_s2k_general, 0, &passthrough_setup,

1 0