diff --git a/tests/unittests/torture_pki_ecdsa.c b/tests/unittests/torture_pki_ecdsa.c index f6b17e8a..1d9672ed 100644 --- a/tests/unittests/torture_pki_ecdsa.c +++ b/tests/unittests/torture_pki_ecdsa.c @@ -1025,12 +1025,14 @@ int torture_run_tests(void) { cmocka_unit_test_setup_teardown(torture_pki_ecdsa_import_pubkey_file, setup_ecdsa_key_521, teardown), - cmocka_unit_test_setup_teardown(torture_pki_ecdsa_import_pubkey_from_openssh_privkey, - setup_openssh_ecdsa_key_256, - teardown), - cmocka_unit_test_setup_teardown(torture_pki_ecdsa_import_pubkey_from_openssh_privkey, - setup_openssh_ecdsa_key_384, - teardown), + cmocka_unit_test_setup_teardown( + torture_pki_ecdsa_import_pubkey_from_openssh_privkey, + setup_openssh_ecdsa_key_256, + teardown), + cmocka_unit_test_setup_teardown( + torture_pki_ecdsa_import_pubkey_from_openssh_privkey, + setup_openssh_ecdsa_key_384, + teardown), cmocka_unit_test_setup_teardown(torture_pki_ecdsa_import_pubkey_file, setup_openssh_ecdsa_key_521, teardown), @@ -1046,24 +1048,30 @@ int torture_run_tests(void) { torture_pki_ecdsa_import_export_privkey_base64_default, setup_ecdsa_key_521, teardown), - cmocka_unit_test_setup_teardown(torture_pki_ecdsa_import_privkey_base64_comment, - setup_ecdsa_key_256, - teardown), - cmocka_unit_test_setup_teardown(torture_pki_ecdsa_import_privkey_base64_comment, - setup_ecdsa_key_384, - teardown), - cmocka_unit_test_setup_teardown(torture_pki_ecdsa_import_privkey_base64_comment, - setup_ecdsa_key_521, - teardown), - cmocka_unit_test_setup_teardown(torture_pki_ecdsa_import_privkey_base64_whitespace, - setup_ecdsa_key_521, - teardown), - cmocka_unit_test_setup_teardown(torture_pki_ecdsa_import_privkey_base64_whitespace, - setup_ecdsa_key_521, - teardown), - cmocka_unit_test_setup_teardown(torture_pki_ecdsa_import_privkey_base64_whitespace, - setup_ecdsa_key_521, - teardown), + cmocka_unit_test_setup_teardown( + torture_pki_ecdsa_import_privkey_base64_comment, + setup_ecdsa_key_256, + teardown), + cmocka_unit_test_setup_teardown( + torture_pki_ecdsa_import_privkey_base64_comment, + setup_ecdsa_key_384, + teardown), + cmocka_unit_test_setup_teardown( + torture_pki_ecdsa_import_privkey_base64_comment, + setup_ecdsa_key_521, + teardown), + cmocka_unit_test_setup_teardown( + torture_pki_ecdsa_import_privkey_base64_whitespace, + setup_ecdsa_key_521, + teardown), + cmocka_unit_test_setup_teardown( + torture_pki_ecdsa_import_privkey_base64_whitespace, + setup_ecdsa_key_521, + teardown), + cmocka_unit_test_setup_teardown( + torture_pki_ecdsa_import_privkey_base64_whitespace, + setup_ecdsa_key_521, + teardown), cmocka_unit_test_setup_teardown( torture_pki_ecdsa_import_export_privkey_base64_default, setup_openssh_ecdsa_key_256, @@ -1076,15 +1084,18 @@ int torture_run_tests(void) { torture_pki_ecdsa_import_export_privkey_base64_default, setup_openssh_ecdsa_key_521, teardown), - cmocka_unit_test_setup_teardown(torture_pki_ecdsa_publickey_from_privatekey, - setup_ecdsa_key_256, - teardown), - cmocka_unit_test_setup_teardown(torture_pki_ecdsa_publickey_from_privatekey, - setup_ecdsa_key_384, - teardown), - cmocka_unit_test_setup_teardown(torture_pki_ecdsa_publickey_from_privatekey, - setup_ecdsa_key_521, - teardown), + cmocka_unit_test_setup_teardown( + torture_pki_ecdsa_publickey_from_privatekey, + setup_ecdsa_key_256, + teardown), + cmocka_unit_test_setup_teardown( + torture_pki_ecdsa_publickey_from_privatekey, + setup_ecdsa_key_384, + teardown), + cmocka_unit_test_setup_teardown( + torture_pki_ecdsa_publickey_from_privatekey, + setup_ecdsa_key_521, + teardown), cmocka_unit_test_setup_teardown(torture_pki_ecdsa_import_cert_file, setup_ecdsa_key_256, teardown), @@ -1112,15 +1123,18 @@ int torture_run_tests(void) { cmocka_unit_test_setup_teardown(torture_pki_ecdsa_publickey_base64, setup_ecdsa_key_521, teardown), - cmocka_unit_test_setup_teardown(torture_pki_ecdsa_generate_pubkey_from_privkey, - setup_ecdsa_key_256, - teardown), - cmocka_unit_test_setup_teardown(torture_pki_ecdsa_generate_pubkey_from_privkey, - setup_ecdsa_key_384, - teardown), - cmocka_unit_test_setup_teardown(torture_pki_ecdsa_generate_pubkey_from_privkey, - setup_ecdsa_key_521, - teardown), + cmocka_unit_test_setup_teardown( + torture_pki_ecdsa_generate_pubkey_from_privkey, + setup_ecdsa_key_256, + teardown), + cmocka_unit_test_setup_teardown( + torture_pki_ecdsa_generate_pubkey_from_privkey, + setup_ecdsa_key_384, + teardown), + cmocka_unit_test_setup_teardown( + torture_pki_ecdsa_generate_pubkey_from_privkey, + setup_ecdsa_key_521, + teardown), cmocka_unit_test_setup_teardown(torture_pki_ecdsa_duplicate_key, setup_ecdsa_key_256, teardown), diff --git a/tests/unittests/torture_pki_ed25519.c b/tests/unittests/torture_pki_ed25519.c index b00c421e..15f4b626 100644 --- a/tests/unittests/torture_pki_ed25519.c +++ b/tests/unittests/torture_pki_ed25519.c @@ -1067,33 +1067,40 @@ int torture_run_tests(void) { cmocka_unit_test_setup_teardown(torture_pki_ed25519_import_pubkey_file, setup_ed25519_key, teardown), - cmocka_unit_test_setup_teardown(torture_pki_ed25519_import_pubkey_from_openssh_privkey, - setup_ed25519_key, - teardown), - cmocka_unit_test_setup_teardown(torture_pki_ed25519_import_privkey_base64, - setup_ed25519_key, - teardown), - cmocka_unit_test_setup_teardown(torture_pki_ed25519_import_privkey_base64_comment, - setup_ed25519_key, - teardown), - cmocka_unit_test_setup_teardown(torture_pki_ed25519_import_privkey_base64_whitespace, - setup_ed25519_key, - teardown), - cmocka_unit_test_setup_teardown(torture_pki_ed25519_import_export_privkey_base64, - setup_ed25519_key, - teardown), - cmocka_unit_test_setup_teardown(torture_pki_ed25519_publickey_from_privatekey, - setup_ed25519_key, - teardown), + cmocka_unit_test_setup_teardown( + torture_pki_ed25519_import_pubkey_from_openssh_privkey, + setup_ed25519_key, + teardown), + cmocka_unit_test_setup_teardown( + torture_pki_ed25519_import_privkey_base64, + setup_ed25519_key, + teardown), + cmocka_unit_test_setup_teardown( + torture_pki_ed25519_import_privkey_base64_comment, + setup_ed25519_key, + teardown), + cmocka_unit_test_setup_teardown( + torture_pki_ed25519_import_privkey_base64_whitespace, + setup_ed25519_key, + teardown), + cmocka_unit_test_setup_teardown( + torture_pki_ed25519_import_export_privkey_base64, + setup_ed25519_key, + teardown), + cmocka_unit_test_setup_teardown( + torture_pki_ed25519_publickey_from_privatekey, + setup_ed25519_key, + teardown), cmocka_unit_test_setup_teardown(torture_pki_ed25519_import_cert_file, setup_ed25519_key, teardown), cmocka_unit_test_setup_teardown(torture_pki_ed25519_publickey_base64, setup_ed25519_key, teardown), - cmocka_unit_test_setup_teardown(torture_pki_ed25519_generate_pubkey_from_privkey, - setup_ed25519_key, - teardown), + cmocka_unit_test_setup_teardown( + torture_pki_ed25519_generate_pubkey_from_privkey, + setup_ed25519_key, + teardown), cmocka_unit_test(torture_pki_ed25519_generate_key), cmocka_unit_test_setup_teardown(torture_pki_ed25519_cert_verify, setup_ed25519_key, diff --git a/tests/unittests/torture_pki_rsa.c b/tests/unittests/torture_pki_rsa.c index 4da6b148..af06b017 100644 --- a/tests/unittests/torture_pki_rsa.c +++ b/tests/unittests/torture_pki_rsa.c @@ -1085,33 +1085,41 @@ int torture_run_tests(void) { cmocka_unit_test_setup_teardown(torture_pki_rsa_import_pubkey_file, setup_rsa_key, teardown), - cmocka_unit_test_setup_teardown(torture_pki_rsa_import_pubkey_from_openssh_privkey, - setup_openssh_rsa_key, - teardown), - cmocka_unit_test_setup_teardown(torture_pki_rsa_import_privkey_base64_NULL_key, - setup_rsa_key, - teardown), - cmocka_unit_test_setup_teardown(torture_pki_rsa_import_privkey_base64_NULL_str, - setup_rsa_key, - teardown), - cmocka_unit_test_setup_teardown(torture_pki_rsa_import_export_privkey_base64, - setup_rsa_key, - teardown), - cmocka_unit_test_setup_teardown(torture_pki_rsa_import_privkey_base64_comment, - setup_rsa_key, - teardown), - cmocka_unit_test_setup_teardown(torture_pki_rsa_import_privkey_base64_whitespace, - setup_rsa_key, - teardown), + cmocka_unit_test_setup_teardown( + torture_pki_rsa_import_pubkey_from_openssh_privkey, + setup_openssh_rsa_key, + teardown), + cmocka_unit_test_setup_teardown( + torture_pki_rsa_import_privkey_base64_NULL_key, + setup_rsa_key, + teardown), + cmocka_unit_test_setup_teardown( + torture_pki_rsa_import_privkey_base64_NULL_str, + setup_rsa_key, + teardown), + cmocka_unit_test_setup_teardown( + torture_pki_rsa_import_export_privkey_base64, + setup_rsa_key, + teardown), + cmocka_unit_test_setup_teardown( + torture_pki_rsa_import_privkey_base64_comment, + setup_rsa_key, + teardown), + cmocka_unit_test_setup_teardown( + torture_pki_rsa_import_privkey_base64_whitespace, + setup_rsa_key, + teardown), cmocka_unit_test_setup_teardown( torture_pki_rsa_import_export_privkey_base64, setup_openssh_rsa_key, teardown), - cmocka_unit_test_setup_teardown(torture_pki_rsa_publickey_from_privatekey, - setup_rsa_key, - teardown), + cmocka_unit_test_setup_teardown( + torture_pki_rsa_publickey_from_privatekey, + setup_rsa_key, + teardown), cmocka_unit_test(torture_pki_rsa_import_privkey_base64_passphrase), - cmocka_unit_test(torture_pki_rsa_import_openssh_privkey_base64_passphrase), + cmocka_unit_test( + torture_pki_rsa_import_openssh_privkey_base64_passphrase), cmocka_unit_test_setup_teardown(torture_pki_rsa_copy_cert_to_privkey, setup_rsa_key, teardown), @@ -1121,9 +1129,10 @@ int torture_run_tests(void) { cmocka_unit_test_setup_teardown(torture_pki_rsa_publickey_base64, setup_rsa_key, teardown), - cmocka_unit_test_setup_teardown(torture_pki_rsa_generate_pubkey_from_privkey, - setup_rsa_key, - teardown), + cmocka_unit_test_setup_teardown( + torture_pki_rsa_generate_pubkey_from_privkey, + setup_rsa_key, + teardown), cmocka_unit_test_setup_teardown(torture_pki_rsa_duplicate_key, setup_rsa_key, teardown),