From cc13e8520255232e7917070222e88ab8dfb3880e Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 4 Jan 2018 15:35:37 +0100 Subject: [PATCH] tests: Fix torture_pki with libcrypto This stops asking for a passphrase on commandline. Signed-off-by: Andreas Schneider --- tests/unittests/torture_pki.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/unittests/torture_pki.c b/tests/unittests/torture_pki.c index 33e7cd89..5493ae3f 100644 --- a/tests/unittests/torture_pki.c +++ b/tests/unittests/torture_pki.c @@ -399,6 +399,7 @@ static void torture_pki_import_privkey_base64_passphrase(void **state) { &key); assert_true(rc == -1); +#ifndef HAVE_LIBCRYPTO /* test if it returns -1 if passphrase is NULL */ /* libcrypto asks for a passphrase, so skip this test */ rc = ssh_pki_import_privkey_base64(torture_get_testkey(SSH_KEYTYPE_DSS, 0, 1), @@ -407,7 +408,8 @@ static void torture_pki_import_privkey_base64_passphrase(void **state) { NULL, &key); assert_true(rc == -1); -# endif +#endif /* HAVE_LIBCRYPTO */ +#endif /* HAVE_DSA */ /* same for ED25519 */ rc = ssh_pki_import_privkey_base64(torture_get_testkey(SSH_KEYTYPE_ED25519, 0, 1), passphrase,