diff options
| author | Hannes Rantzsch <[email protected]> | 2018-12-04 16:56:59 +0100 |
|---|---|---|
| committer | Hannes Rantzsch <[email protected]> | 2018-12-04 17:06:34 +0100 |
| commit | 11eb3a150c26030632ac56a3d83512249a9e2c90 (patch) | |
| tree | c79d94430a0ebf28a7386d12fa905d2e59f8f27a /src | |
| parent | 7432a5297cf2c57c40d925a943051eec08e20fc9 (diff) | |
Extend the SignMechanisms map for Signature_Scheme padding strings
This addresses #730. The tls_sign_message callback was unable to handle
emsa strings produced as padding strings for TLS::Signature_Scheme, due
to inconsistent naming (mostly between EMSA3 and EMSA_PKCS1).
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/prov/pkcs11/p11_mechanism.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/lib/prov/pkcs11/p11_mechanism.cpp b/src/lib/prov/pkcs11/p11_mechanism.cpp index 01c38ded5..a5299d711 100644 --- a/src/lib/prov/pkcs11/p11_mechanism.cpp +++ b/src/lib/prov/pkcs11/p11_mechanism.cpp @@ -75,6 +75,11 @@ static std::map<std::string, RSA_SignMechanism> SignMechanisms = { { "Raw", RSA_SignMechanism(MechanismType::RsaX509) }, + { "EMSA1(SHA-1)", RSA_SignMechanism(MechanismType::DsaSha1) }, + { "EMSA1(SHA-256)", RSA_SignMechanism(MechanismType::DsaSha256) }, + { "EMSA1(SHA-384)", RSA_SignMechanism(MechanismType::DsaSha384) }, + { "EMSA1(SHA-512)", RSA_SignMechanism(MechanismType::DsaSha512) }, + { "EMSA2(Raw)", RSA_SignMechanism(MechanismType::RsaX931) }, { "EMSA2(SHA-1)", RSA_SignMechanism(MechanismType::Sha1RsaX931) }, @@ -86,6 +91,12 @@ static std::map<std::string, RSA_SignMechanism> SignMechanisms = { "EMSA3(SHA-384)", RSA_SignMechanism(MechanismType::Sha384RsaPkcs) }, { "EMSA3(SHA-512)", RSA_SignMechanism(MechanismType::Sha512RsaPkcs) }, + { "EMSA_PKCS1(SHA-1)", RSA_SignMechanism(MechanismType::Sha1RsaPkcs) }, + { "EMSA_PKCS1(SHA-224)", RSA_SignMechanism(MechanismType::Sha224RsaPkcs) }, + { "EMSA_PKCS1(SHA-256)", RSA_SignMechanism(MechanismType::Sha256RsaPkcs) }, + { "EMSA_PKCS1(SHA-384)", RSA_SignMechanism(MechanismType::Sha384RsaPkcs) }, + { "EMSA_PKCS1(SHA-512)", RSA_SignMechanism(MechanismType::Sha512RsaPkcs) }, + // RSASSA PKCS#1 PSS { "EMSA4(Raw)", RSA_SignMechanism(MechanismType::RsaPkcsPss) }, { "EMSA4(SHA-1)", RSA_SignMechanism(MechanismType::Sha1RsaPkcsPss) }, @@ -94,6 +105,10 @@ static std::map<std::string, RSA_SignMechanism> SignMechanisms = { "EMSA4(SHA-384)", RSA_SignMechanism(MechanismType::Sha384RsaPkcsPss) }, { "EMSA4(SHA-512)", RSA_SignMechanism(MechanismType::Sha512RsaPkcsPss) }, + { "PSSR(SHA-256,MGF1,32)", RSA_SignMechanism(MechanismType::Sha256RsaPkcsPss) }, + { "PSSR(SHA-384,MGF1,48)", RSA_SignMechanism(MechanismType::Sha384RsaPkcsPss) }, + { "PSSR(SHA-512,MGF1,64)", RSA_SignMechanism(MechanismType::Sha512RsaPkcsPss) }, + { "ISO9796", RSA_SignMechanism(MechanismType::Rsa9796) } }; |