shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-03-24 20:40:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

tests: Use the new ssh_pki_generate_key() where possible

Browse Source 
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Eshan Kelkar <eshankelkar@galorithm.com>
This commit is contained in:
Jakub Jelen
2026-03-12 14:40:34 +01:00
parent 616d165f14
commit b1a28f7987
4 changed files with 58 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/unittests/torture_pki_ecdsa.c
View File

@@ -647,7 +647,7 @@ static void torture_pki_generate_key_ecdsa(void **state)
ssh_session session=ssh_new();
(void) state;
rc = ssh_pki_generate(SSH_KEYTYPE_ECDSA_P256, 0, &key);
rc = ssh_pki_generate_key(SSH_KEYTYPE_ECDSA_P256, NULL, &key);
assert_return_code(rc, errno);
assert_non_null(key);
rc = ssh_pki_export_privkey_to_pubkey(key, &pubkey);
@@ -690,7 +690,7 @@ static void torture_pki_generate_key_ecdsa(void **state)
SSH_KEY_FREE(key);
SSH_KEY_FREE(pubkey);
rc = ssh_pki_generate(SSH_KEYTYPE_ECDSA_P384, 0, &key);
rc = ssh_pki_generate_key(SSH_KEYTYPE_ECDSA_P384, NULL, &key);
assert_return_code(rc, errno);
assert_non_null(key);
rc = ssh_pki_export_privkey_to_pubkey(key, &pubkey);
@@ -733,7 +733,7 @@ static void torture_pki_generate_key_ecdsa(void **state)
SSH_KEY_FREE(key);
SSH_KEY_FREE(pubkey);
rc = ssh_pki_generate(SSH_KEYTYPE_ECDSA_P521, 0, &key);
rc = ssh_pki_generate_key(SSH_KEYTYPE_ECDSA_P521, NULL, &key);
assert_return_code(rc, errno);
assert_non_null(key);
rc = ssh_pki_export_privkey_to_pubkey(key, &pubkey);

2
tests/unittests/torture_pki_ed25519.c
View File

@@ -546,7 +546,7 @@ static void torture_pki_ed25519_generate_key(void **state)
assert_non_null(session);
rc = ssh_pki_generate(SSH_KEYTYPE_ED25519, 256, &key);
rc = ssh_pki_generate_key(SSH_KEYTYPE_ED25519, NULL, &key);
assert_true(rc == SSH_OK);
assert_non_null(key);
rc = ssh_pki_export_privkey_to_pubkey(key, &pubkey);

40
tests/unittests/torture_pki_rsa.c
View File

@@ -440,7 +440,7 @@ static void torture_pki_rsa_copy_cert_to_privkey(void **state)
SSH_KEY_FREE(pubkey);
/* Generate different key and try to assign it this certificate */
rc = ssh_pki_generate(SSH_KEYTYPE_RSA, 2048, &privkey);
rc = ssh_pki_generate_key(SSH_KEYTYPE_RSA, NULL, &privkey);
assert_return_code(rc, errno);
assert_non_null(privkey);
rc = ssh_pki_export_privkey_to_pubkey(privkey, &pubkey);
@@ -765,10 +765,18 @@ static void torture_pki_rsa_key_size(void **state)
ssh_signature sign = NULL;
ssh_session session=ssh_new();
unsigned int length = 4096;
int bit_size = 2048;
ssh_pki_ctx ctx = NULL;
(void) state;
(void)state;
rc = ssh_pki_generate(SSH_KEYTYPE_RSA, 2048, &key);
ctx = ssh_pki_ctx_new();
assert_non_null(ctx);
rc = ssh_pki_ctx_options_set(ctx, SSH_PKI_OPTION_RSA_KEY_SIZE, &bit_size);
assert_return_code(rc, errno);
rc = ssh_pki_generate_key(SSH_KEYTYPE_RSA, ctx, &key);
assert_return_code(rc, errno);
assert_non_null(key);
rc = ssh_pki_export_privkey_to_pubkey(key, &pubkey);
@@ -790,9 +798,7 @@ static void torture_pki_rsa_key_size(void **state)
ssh_signature_free(sign);
SSH_KEY_FREE(key);
SSH_KEY_FREE(pubkey);
key = NULL;
pubkey = NULL;
SSH_PKI_CTX_FREE(ctx);
ssh_free(session);
}
@@ -890,11 +896,19 @@ static void torture_pki_sign_data_rsa(void **state)
{
int rc;
ssh_key key = NULL;
ssh_pki_ctx ctx = NULL;
int bit_size = 2048;
(void) state;
/* Setup */
rc = ssh_pki_generate(SSH_KEYTYPE_RSA, 2048, &key);
ctx = ssh_pki_ctx_new();
assert_non_null(ctx);
rc = ssh_pki_ctx_options_set(ctx, SSH_PKI_OPTION_RSA_KEY_SIZE, &bit_size);
assert_int_equal(rc, SSH_OK);
rc = ssh_pki_generate_key(SSH_KEYTYPE_RSA, ctx, &key);
assert_int_equal(rc, SSH_OK);
assert_non_null(key);
@@ -914,6 +928,7 @@ static void torture_pki_sign_data_rsa(void **state)
/* Cleanup */
SSH_KEY_FREE(key);
SSH_PKI_CTX_FREE(ctx);
}
static void torture_pki_fail_sign_with_incompatible_hash(void **state)
@@ -921,12 +936,20 @@ static void torture_pki_fail_sign_with_incompatible_hash(void **state)
int rc;
ssh_key key = NULL;
ssh_key pubkey = NULL;
ssh_pki_ctx ctx = NULL;
int bit_size = 2048;
ssh_signature sig, bad_sig;
(void) state;
/* Setup */
rc = ssh_pki_generate(SSH_KEYTYPE_RSA, 2048, &key);
ctx = ssh_pki_ctx_new();
assert_non_null(ctx);
rc = ssh_pki_ctx_options_set(ctx, SSH_PKI_OPTION_RSA_KEY_SIZE, &bit_size);
assert_int_equal(rc, SSH_OK);
rc = ssh_pki_generate_key(SSH_KEYTYPE_RSA, ctx, &key);
assert_int_equal(rc, SSH_OK);
assert_non_null(key);
@@ -956,6 +979,7 @@ static void torture_pki_fail_sign_with_incompatible_hash(void **state)
ssh_signature_free(sig);
SSH_KEY_FREE(pubkey);
SSH_KEY_FREE(key);
SSH_PKI_CTX_FREE(ctx);
}
static void

26
tests/unittests/torture_threads_pki_rsa.c
View File

@@ -550,14 +550,23 @@ static void *thread_pki_rsa_generate_key(void *threadid)
ssh_key key = NULL, pubkey = NULL;
ssh_signature sign = NULL;
ssh_session session = NULL;
ssh_pki_ctx ctx = NULL;
int size = 0;
(void) threadid;
session = ssh_new();
assert_non_null(session);
ctx = ssh_pki_ctx_new();
assert_non_null(ctx);
if (!ssh_fips_mode()) {
rc = ssh_pki_generate(SSH_KEYTYPE_RSA, 1024, &key);
size = 1024;
rc = ssh_pki_ctx_options_set(ctx, SSH_PKI_OPTION_RSA_KEY_SIZE, &size);
assert_return_code(rc, errno);
rc = ssh_pki_generate_key(SSH_KEYTYPE_RSA, ctx, &key);
assert_ssh_return_code(session, rc);
assert_non_null(key);
@@ -576,7 +585,11 @@ static void *thread_pki_rsa_generate_key(void *threadid)
SSH_KEY_FREE(pubkey);
}
rc = ssh_pki_generate(SSH_KEYTYPE_RSA, 2048, &key);
size = 2048;
rc = ssh_pki_ctx_options_set(ctx, SSH_PKI_OPTION_RSA_KEY_SIZE, &size);
assert_return_code(rc, errno);
rc = ssh_pki_generate_key(SSH_KEYTYPE_RSA, ctx, &key);
assert_ssh_return_code(session, rc);
assert_non_null(key);
@@ -594,8 +607,12 @@ static void *thread_pki_rsa_generate_key(void *threadid)
SSH_KEY_FREE(key);
SSH_KEY_FREE(pubkey);
rc = ssh_pki_generate(SSH_KEYTYPE_RSA, 4096, &key);
assert_true(rc == SSH_OK);
size = 4096;
rc = ssh_pki_ctx_options_set(ctx, SSH_PKI_OPTION_RSA_KEY_SIZE, &size);
assert_return_code(rc, errno);
rc = ssh_pki_generate_key(SSH_KEYTYPE_RSA, ctx, &key);
assert_ssh_return_code(session, rc);
assert_non_null(key);
rc = ssh_pki_export_privkey_to_pubkey(key, &pubkey);
@@ -612,6 +629,7 @@ static void *thread_pki_rsa_generate_key(void *threadid)
SSH_KEY_FREE(key);
SSH_KEY_FREE(pubkey);
SSH_PKI_CTX_FREE(ctx);
ssh_free(session);
return NULL;