lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-07-31 00:03:07 +03:00
Code Activity

tests/torture.c: update the definition of torture_setup_tokens() to take load_public as an option that

Browse Source 
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>
This commit is contained in:
Sahana Prasad
2020-05-14 16:25:19 +02:00
parent d3f7b64579
commit 7eb6c7ee6c
5 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/client/torture_auth_pkcs11.c
View File

@ -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); 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; return 0;
} }

8
tests/torture.c
View File

@ -1127,16 +1127,18 @@ void torture_setup_sshd_server(void **state, bool pam)
void torture_setup_tokens(const char *temp_dir, void torture_setup_tokens(const char *temp_dir,
const char *filename, const char *filename,
const char object_name[]) const char object_name[],
const char *load_public)
{ {
char token_setup_start_cmd[1024] = {0}; char token_setup_start_cmd[1024] = {0};
int rc; int rc;
snprintf(token_setup_start_cmd, sizeof(token_setup_start_cmd), 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, BINARYDIR,
temp_dir, temp_dir,
filename, object_name); filename,
object_name, load_public);
rc = system(token_setup_start_cmd); rc = system(token_setup_start_cmd);
assert_return_code(rc, errno); assert_return_code(rc, errno);

5
tests/torture.h
View File

@ -125,7 +125,10 @@ int torture_server_port(void);
void torture_setup_socket_dir(void **state); void torture_setup_socket_dir(void **state);
void torture_setup_sshd_server(void **state, bool pam); 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_socket_dir(void **state);
void torture_teardown_sshd_server(void **state); void torture_teardown_sshd_server(void **state);

10
tests/unittests/torture_pki_ecdsa_uri.c
View File

@ -37,7 +37,7 @@ struct pki_st {
enum ssh_keytypes_e type; 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; 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_get_testkey(test_state->type, 0));
torture_write_file(pub_filename, torture_write_file(pub_filename,
torture_get_testkey_pub_pem(test_state->type)); 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; 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); snprintf(conf_path, sizeof(conf_path), "%s/softhsm.conf", test_state->temp_dir);
setenv("SOFTHSM2_CONF", conf_path, 1); setenv("SOFTHSM2_CONF", conf_path, 1);
setup_tokens_ecdsa(state, 256, "ecdsa256"); setup_tokens_ecdsa(state, 256, "ecdsa256", "1");
setup_tokens_ecdsa(state, 384, "ecdsa384"); setup_tokens_ecdsa(state, 384, "ecdsa384", "1");
setup_tokens_ecdsa(state, 521, "ecdsa521"); setup_tokens_ecdsa(state, 521, "ecdsa521", "1");
return 0; return 0;
} }

2
tests/unittests/torture_pki_rsa_uri.c
View File

@ -83,7 +83,7 @@ static int setup_tokens(void **state)
torture_write_file(keys_path_pub, torture_write_file(keys_path_pub,
torture_get_testkey_pub_pem(SSH_KEYTYPE_RSA)); 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); snprintf(conf_path, sizeof(conf_path), "%s/softhsm.conf", cwd);