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

tls-crypto: Distinguish between signing and verifying signature schemes

Browse Source 
strongSwan supports RSA_PSS_RSAE schemes for signing but does not
differentiate between rsaEncryption and rsassaPss encoding. Thus
RSA_PSS_PSS schemes are only used for verifying signatures.
This commit is contained in:
Pascal Knecht
2021-02-12 14:35:23 +01:00
committed by Tobias Brunner
parent e731396280
commit 06112f3fe2
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libtls/tls_crypto.c
+8 -9
View File
@@ -1512,19 +1512,18 @@ METHOD(tls_crypto_t, get_signature_algorithms, void,
/** /**
* Get the signature parameters from a TLS signature scheme * Get the signature parameters from a TLS signature scheme
*/ */
static signature_params_t *params_for_scheme(tls_signature_scheme_t sig) static signature_params_t *params_for_scheme(tls_signature_scheme_t sig,
bool sign)
{ {
int i; int i;
for (i = 0; i < countof(schemes); i++) for (i = 0; i < countof(schemes); i++)
{ {
/* strongSwan supports only RSA_PSS_RSAE schemes for signing but can /* strongSwan supports only RSA_PSS_RSAE schemes for signing but can
* verify public keys in rsaEncryption as well as rsassaPss encoding. * verify public keys in rsaEncryption as well as rsassaPss encoding. */
* Current implementation does not distinguish between signing and if (sign && (sig == TLS_SIG_RSA_PSS_PSS_SHA256 ||
* verifying. */ sig == TLS_SIG_RSA_PSS_PSS_SHA384 ||
if (sig == TLS_SIG_RSA_PSS_PSS_SHA256 || sig == TLS_SIG_RSA_PSS_PSS_SHA512))
sig == TLS_SIG_RSA_PSS_PSS_SHA384 ||
sig == TLS_SIG_RSA_PSS_PSS_SHA512)
{ {
continue; continue;
} }
@@ -1765,7 +1764,7 @@ METHOD(tls_crypto_t, sign, bool,
{ {
if (reader->read_uint16(reader, &scheme)) if (reader->read_uint16(reader, &scheme))
{ {
params = params_for_scheme(scheme); params = params_for_scheme(scheme, TRUE);
if (params && if (params &&
type == key_type_from_signature_scheme(params->scheme) && type == key_type_from_signature_scheme(params->scheme) &&
key->sign(key, params->scheme, params->params, data, &sig)) key->sign(key, params->scheme, params->params, data, &sig))
@@ -1840,7 +1839,7 @@ METHOD(tls_crypto_t, verify, bool,
DBG1(DBG_TLS, "received invalid signature"); DBG1(DBG_TLS, "received invalid signature");
return FALSE; return FALSE;
} }
params = params_for_scheme(scheme); params = params_for_scheme(scheme, FALSE);
if (!params) if (!params)
{ {
DBG1(DBG_TLS, "signature algorithms %N not supported", DBG1(DBG_TLS, "signature algorithms %N not supported",