← Back to branch summary

~vcs-imports/libssh/trunk

« back to all changes in this revision

Viewing changes to tests/unittests/torture_pki_ecdsa_uri.c

  • Committer: Sahana Prasad
  • Date: 2020-05-20 10:49:29 UTC
  • Revision ID: git-v1:7eb6c7ee6c1633d6fe73fd094ba3aa80d9f1cb3d
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>

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/unittests/torture_pki_ecdsa_uri.c
37
37
    enum ssh_keytypes_e type;
38
38
};
39
39
 
40
 
static int setup_tokens_ecdsa(void **state, int ecdsa_bits, const char *obj_tempname)
 
40
static int setup_tokens_ecdsa(void **state, int ecdsa_bits, const char *obj_tempname, const char *load_public)
41
41
{
42
42
 
43
43
    struct pki_st *test_state = *state;
67
67
                       torture_get_testkey(test_state->type, 0));
68
68
    torture_write_file(pub_filename,
69
69
                       torture_get_testkey_pub_pem(test_state->type));
70
 
    torture_setup_tokens(cwd, priv_filename, obj_tempname);
 
70
    torture_setup_tokens(cwd, priv_filename, obj_tempname, load_public);
71
71
 
72
72
    return 0;
73
73
}
99
99
    snprintf(conf_path, sizeof(conf_path), "%s/softhsm.conf", test_state->temp_dir);
100
100
    setenv("SOFTHSM2_CONF", conf_path, 1);
101
101
 
102
 
    setup_tokens_ecdsa(state, 256, "ecdsa256");
103
 
    setup_tokens_ecdsa(state, 384, "ecdsa384");
104
 
    setup_tokens_ecdsa(state, 521, "ecdsa521");
 
102
    setup_tokens_ecdsa(state, 256, "ecdsa256", "1");
 
103
    setup_tokens_ecdsa(state, 384, "ecdsa384", "1");
 
104
    setup_tokens_ecdsa(state, 521, "ecdsa521", "1");
105
105
 
106
106
    return 0;
107
107
}