denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gmp: Use helper to determine XOF type

Browse Source
This commit is contained in:
Tobias Brunner
2017-11-08 16:48:10 +01:00
parent 883e7fcd65
commit 126fd8af09
2 changed files with 10 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/plugins/gmp/gmp_rsa_private_key.c
+5 -14
View File
@@ -354,21 +354,12 @@ static bool build_emsa_pss_signature(private_gmp_rsa_private_key_t *this,
{ {
return FALSE; return FALSE;
} }
switch (params->mgf1_hash) xof = xof_mgf1_from_hash_algorithm(params->mgf1_hash);
if (xof == XOF_UNDEFINED)
{ {
case HASH_SHA1: DBG1(DBG_LIB, "%N is not supported for MGF1", hash_algorithm_names,
xof = XOF_MGF1_SHA1; params->mgf1_hash);
break; return FALSE;
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;
} }
/* emBits = modBits - 1 */ /* emBits = modBits - 1 */
embits = mpz_sizeinbase(this->n, 2) - 1; embits = mpz_sizeinbase(this->n, 2) - 1;
src/libstrongswan/plugins/gmp/gmp_rsa_public_key.c
+5 -14
View File
@@ -304,21 +304,12 @@ static bool verify_emsa_pss_signature(private_gmp_rsa_public_key_t *this,
{ {
return FALSE; return FALSE;
} }
switch (params->mgf1_hash) xof = xof_mgf1_from_hash_algorithm(params->mgf1_hash);
if (xof == XOF_UNDEFINED)
{ {
case HASH_SHA1: DBG1(DBG_LIB, "%N is not supported for MGF1", hash_algorithm_names,
xof = XOF_MGF1_SHA1; params->mgf1_hash);
break; return FALSE;
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;
} }
chunk_skip_zero(signature); chunk_skip_zero(signature);
if (signature.len == 0 || signature.len > this->k) if (signature.len == 0 || signature.len > this->k)