aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSahana Prasad <sahana@redhat.com>2020-05-14 16:25:19 +0200
committerSahana Prasad <sahana@redhat.com>2020-05-20 12:49:29 +0200
commit7eb6c7ee6c1633d6fe73fd094ba3aa80d9f1cb3d (patch)
tree33b96799a6d5c59ae38a385c89b3254b319a92a4
parentd3f7b64579a2b3d357900a10e5329f2d3bb30985 (diff)
downloadlibssh-7eb6c7ee6c1633d6fe73fd094ba3aa80d9f1cb3d.tar.gz
libssh-7eb6c7ee6c1633d6fe73fd094ba3aa80d9f1cb3d.tar.xz
libssh-7eb6c7ee6c1633d6fe73fd094ba3aa80d9f1cb3d.zip
tests/torture.c: update the definition of torture_setup_tokens() to take load_public as an option that
determines if public keys must be loaded in pkcs #11 tokens or not. tests: Adds the load_public parameter in all files where torture_setup_tokens() was used. Signed-off-by: Sahana Prasad <sahana@redhat.com> Reviewed-by: Jakub Jelen <jjelen@redhat.com>
-rw-r--r--tests/client/torture_auth_pkcs11.c2
-rw-r--r--tests/torture.c8
-rw-r--r--tests/torture.h5
-rw-r--r--tests/unittests/torture_pki_ecdsa_uri.c10
-rw-r--r--tests/unittests/torture_pki_rsa_uri.c2
5 files changed, 16 insertions, 11 deletions
diff --git a/tests/client/torture_auth_pkcs11.c b/tests/client/torture_auth_pkcs11.c
index 79b32e15..ee97bff4 100644
--- a/tests/client/torture_auth_pkcs11.c
+++ b/tests/client/torture_auth_pkcs11.c
@@ -61,7 +61,7 @@ static int setup_tokens(void **state, const char *type, const char *obj_name)
snprintf(priv_filename, sizeof(priv_filename), "%s%s", test_state->keys_dir, type);
- torture_setup_tokens(cwd, priv_filename, obj_name);
+ torture_setup_tokens(cwd, priv_filename, obj_name, "1");
return 0;
}
diff --git a/tests/torture.c b/tests/torture.c
index 1c64f6de..e322aaa1 100644
--- a/tests/torture.c
+++ b/tests/torture.c
@@ -1127,16 +1127,18 @@ void torture_setup_sshd_server(void **state, bool pam)
void torture_setup_tokens(const char *temp_dir,
const char *filename,
- const char object_name[])
+ const char object_name[],
+ const char *load_public)
{
char token_setup_start_cmd[1024] = {0};
int rc;
snprintf(token_setup_start_cmd, sizeof(token_setup_start_cmd),
- "%s/tests/pkcs11/setup-softhsm-tokens.sh %s %s %s",
+ "%s/tests/pkcs11/setup-softhsm-tokens.sh %s %s %s %s",
BINARYDIR,
temp_dir,
- filename, object_name);
+ filename,
+ object_name, load_public);
rc = system(token_setup_start_cmd);
assert_return_code(rc, errno);
diff --git a/tests/torture.h b/tests/torture.h
index 69ce5dc9..dc211443 100644
--- a/tests/torture.h
+++ b/tests/torture.h
@@ -125,7 +125,10 @@ int torture_server_port(void);
void torture_setup_socket_dir(void **state);
void torture_setup_sshd_server(void **state, bool pam);
-void torture_setup_tokens(const char *temp_dir, const char *filename, const char object_name[]);
+void torture_setup_tokens(const char *temp_dir,
+ const char *filename,
+ const char object_name[],
+ const char *load_public);
void torture_teardown_socket_dir(void **state);
void torture_teardown_sshd_server(void **state);
diff --git a/tests/unittests/torture_pki_ecdsa_uri.c b/tests/unittests/torture_pki_ecdsa_uri.c
index 78772db7..e5b17df7 100644
--- a/tests/unittests/torture_pki_ecdsa_uri.c
+++ b/tests/unittests/torture_pki_ecdsa_uri.c
@@ -37,7 +37,7 @@ struct pki_st {
enum ssh_keytypes_e type;
};
-static int setup_tokens_ecdsa(void **state, int ecdsa_bits, const char *obj_tempname)
+static int setup_tokens_ecdsa(void **state, int ecdsa_bits, const char *obj_tempname, const char *load_public)
{
struct pki_st *test_state = *state;
@@ -67,7 +67,7 @@ static int setup_tokens_ecdsa(void **state, int ecdsa_bits, const char *obj_temp
torture_get_testkey(test_state->type, 0));
torture_write_file(pub_filename,
torture_get_testkey_pub_pem(test_state->type));
- torture_setup_tokens(cwd, priv_filename, obj_tempname);
+ torture_setup_tokens(cwd, priv_filename, obj_tempname, load_public);
return 0;
}
@@ -99,9 +99,9 @@ static int setup_directory_structure(void **state)
snprintf(conf_path, sizeof(conf_path), "%s/softhsm.conf", test_state->temp_dir);
setenv("SOFTHSM2_CONF", conf_path, 1);
- setup_tokens_ecdsa(state, 256, "ecdsa256");
- setup_tokens_ecdsa(state, 384, "ecdsa384");
- setup_tokens_ecdsa(state, 521, "ecdsa521");
+ setup_tokens_ecdsa(state, 256, "ecdsa256", "1");
+ setup_tokens_ecdsa(state, 384, "ecdsa384", "1");
+ setup_tokens_ecdsa(state, 521, "ecdsa521", "1");
return 0;
}
diff --git a/tests/unittests/torture_pki_rsa_uri.c b/tests/unittests/torture_pki_rsa_uri.c
index 09b41b5d..370c6ec3 100644
--- a/tests/unittests/torture_pki_rsa_uri.c
+++ b/tests/unittests/torture_pki_rsa_uri.c
@@ -83,7 +83,7 @@ static int setup_tokens(void **state)
torture_write_file(keys_path_pub,
torture_get_testkey_pub_pem(SSH_KEYTYPE_RSA));
- torture_setup_tokens(cwd, keys_path, obj_tempname);
+ torture_setup_tokens(cwd, keys_path, obj_tempname, "1");
snprintf(conf_path, sizeof(conf_path), "%s/softhsm.conf", cwd);