gmp: Use helper to determine XOF type

diff --git a/src/libstrongswan/plugins/gmp/gmp_rsa_private_key.c b/src/libstrongswan/plugins/gmp/gmp_rsa_private_key.c
index 3a9296535f18eb33d1b44567f4e23ce214eaf949..e24fda8c26a26dbb8a1a6ebba074fd58e7034ce8 100644 (file)
--- a/src/libstrongswan/plugins/gmp/gmp_rsa_private_key.c
+++ b/src/libstrongswan/plugins/gmp/gmp_rsa_private_key.c
@@ -354,21 +354,12 @@ static bool build_emsa_pss_signature(private_gmp_rsa_private_key_t *this,
        {
                return FALSE;
        }
-       switch (params->mgf1_hash)
+       xof = xof_mgf1_from_hash_algorithm(params->mgf1_hash);
+       if (xof == XOF_UNDEFINED)
        {
-               case HASH_SHA1:
-                       xof = XOF_MGF1_SHA1;
-                       break;
-               case HASH_SHA256:
-                       xof = XOF_MGF1_SHA256;
-                       break;
-               case HASH_SHA512:
-                       xof = XOF_MGF1_SHA512;
-                       break;
-               default:
-                       DBG1(DBG_LIB, "%N is not supported for MGF1", hash_algorithm_names,
-                                params->mgf1_hash);
-                       return FALSE;
+               DBG1(DBG_LIB, "%N is not supported for MGF1", hash_algorithm_names,
+                        params->mgf1_hash);
+               return FALSE;
        }
        /* emBits = modBits - 1 */
        embits = mpz_sizeinbase(this->n, 2) - 1;

diff --git a/src/libstrongswan/plugins/gmp/gmp_rsa_public_key.c b/src/libstrongswan/plugins/gmp/gmp_rsa_public_key.c
index 45fdf1d675ce1cef6b9a92627017de513a7a8b36..52bc9fb3804630dc70d81c7e2fc6fe89e0ec582a 100644 (file)
--- a/src/libstrongswan/plugins/gmp/gmp_rsa_public_key.c
+++ b/src/libstrongswan/plugins/gmp/gmp_rsa_public_key.c
@@ -304,21 +304,12 @@ static bool verify_emsa_pss_signature(private_gmp_rsa_public_key_t *this,
        {
                return FALSE;
        }
-       switch (params->mgf1_hash)
+       xof = xof_mgf1_from_hash_algorithm(params->mgf1_hash);
+       if (xof == XOF_UNDEFINED)
        {
-               case HASH_SHA1:
-                       xof = XOF_MGF1_SHA1;
-                       break;
-               case HASH_SHA256:
-                       xof = XOF_MGF1_SHA256;
-                       break;
-               case HASH_SHA512:
-                       xof = XOF_MGF1_SHA512;
-                       break;
-               default:
-                       DBG1(DBG_LIB, "%N is not supported for MGF1", hash_algorithm_names,
-                                params->mgf1_hash);
-                       return FALSE;
+               DBG1(DBG_LIB, "%N is not supported for MGF1", hash_algorithm_names,
+                        params->mgf1_hash);
+               return FALSE;
        }
        chunk_skip_zero(signature);
        if (signature.len == 0 || signature.len > this->k)