auth-cfg: Store signature schemes as signature_params_t objects

[thirdparty/strongswan.git] / src / libstrongswan / tests / suites / test_hasher.c

diff --git a/src/libstrongswan/tests/suites/test_hasher.c b/src/libstrongswan/tests/suites/test_hasher.c
index 9f77419698af08d38fb91c61d0ffa2ff899e5f32..7bf5273291c51784380e12a13a1a82d294f99d4f 100644 (file)
--- a/src/libstrongswan/tests/suites/test_hasher.c
+++ b/src/libstrongswan/tests/suites/test_hasher.c
@@ -90,12 +90,10 @@ START_TEST(test_hasher_sig_to_oid)
 }
 END_TEST
 
-typedef struct {
+static struct {
        signature_scheme_t scheme;
        hash_algorithm_t alg;
-}hasher_sig_scheme_t;
-
-static hasher_sig_scheme_t sig_schemes[] = {
+} sig_schemes[] = {
        { SIGN_UNKNOWN,               HASH_UNKNOWN    },
        { SIGN_RSA_EMSA_PKCS1_NULL,   HASH_UNKNOWN    },
        { SIGN_RSA_EMSA_PKCS1_MD5,    HASH_MD5        },
@@ -108,6 +106,7 @@ static hasher_sig_scheme_t sig_schemes[] = {
        { SIGN_RSA_EMSA_PKCS1_SHA3_256, HASH_SHA3_256 },
        { SIGN_RSA_EMSA_PKCS1_SHA3_384, HASH_SHA3_384 },
        { SIGN_RSA_EMSA_PKCS1_SHA3_512, HASH_SHA3_512 },
+       { SIGN_RSA_EMSA_PSS,              HASH_UNKNOWN    },
        { SIGN_ECDSA_WITH_SHA1_DER,   HASH_SHA1       },
        { SIGN_ECDSA_WITH_SHA256_DER, HASH_SHA256     },
        { SIGN_ECDSA_WITH_SHA384_DER, HASH_SHA384     },
@@ -124,16 +123,35 @@ static hasher_sig_scheme_t sig_schemes[] = {
        { SIGN_BLISS_WITH_SHA3_512,   HASH_SHA3_512   },
        { SIGN_ED25519,               HASH_IDENTITY   },
        { SIGN_ED448,                 HASH_IDENTITY   },
-       { 30,                                             HASH_UNKNOWN    }
+       { 30,                                             HASH_UNKNOWN    },
 };
 
 START_TEST(test_hasher_from_sig_scheme)
 {
-       ck_assert(hasher_from_signature_scheme(sig_schemes[_i].scheme) ==
+       ck_assert(hasher_from_signature_scheme(sig_schemes[_i].scheme, NULL) ==
                                                                                   sig_schemes[_i].alg);
 }
 END_TEST
 
+static struct {
+       signature_scheme_t scheme;
+       union {
+               rsa_pss_params_t pss;
+       } p;
+       hash_algorithm_t alg;
+} sig_schemes_params[] = {
+       { SIGN_RSA_EMSA_PSS, .p.pss = { .hash = HASH_SHA256 }, HASH_SHA256 },
+       { SIGN_RSA_EMSA_PSS, .p.pss = { .hash = HASH_SHA512 }, HASH_SHA512 },
+       { SIGN_RSA_EMSA_PKCS1_SHA2_256, .p.pss = { .hash = HASH_SHA512 }, HASH_SHA256 },
+};
+
+START_TEST(test_hasher_from_sig_scheme_params)
+{
+       ck_assert(hasher_from_signature_scheme(sig_schemes_params[_i].scheme,
+                                       &sig_schemes_params[_i].p) == sig_schemes_params[_i].alg);
+}
+END_TEST
+
 typedef struct {
        pseudo_random_function_t prf;
        hash_algorithm_t alg;
@@ -269,6 +287,7 @@ Suite *hasher_suite_create()
 
        tc = tcase_create("from_sig_scheme");
        tcase_add_loop_test(tc, test_hasher_from_sig_scheme, 0, countof(sig_schemes));
+       tcase_add_loop_test(tc, test_hasher_from_sig_scheme_params, 0, countof(sig_schemes_params));
        suite_add_tcase(s, tc);
 
        tc = tcase_create("from_prf");