Merge pull request #6078 from SparkiDev/rsapss_openssl_compat

X509 RSA PSS: fixes for OpenSSL compat layer
This commit is contained in:
David Garske
2023-02-13 08:43:10 -08:00
committed by GitHub
3 changed files with 15 additions and 39 deletions

View File

@@ -27438,6 +27438,9 @@ const WOLFSSL_ObjectInfo wolfssl_object_info[] = {
"sha3-512WithRSAEncryption"},
#endif
#endif
#ifdef WC_RSA_PSS
{ NID_rsassaPss, CTC_RSASSAPSS, oidSigType, "RSASSA-PSS", "rsassaPss" },
#endif
#endif /* NO_RSA */
#ifdef HAVE_ECC
#ifndef NO_SHA
@@ -27481,6 +27484,9 @@ const WOLFSSL_ObjectInfo wolfssl_object_info[] = {
#endif /* NO_DSA */
#ifndef NO_RSA
{ NID_rsaEncryption, RSAk, oidKeyType, "rsaEncryption", "rsaEncryption"},
#ifdef WC_RSA_PSS
{ NID_rsassaPss, RSAPSSk, oidKeyType, "RSASSA-PSS", "rsassaPss"},
#endif
#endif /* NO_RSA */
#ifdef HAVE_ECC
{ NID_X9_62_id_ecPublicKey, ECDSAk, oidKeyType, "id-ecPublicKey",
@@ -35942,6 +35948,10 @@ int oid2nid(word32 oid, int grp)
case CTC_SHA3_512wRSA:
return NID_RSA_SHA3_512;
#endif
#ifdef WC_RSA_PSS
case CTC_RSASSAPSS:
return NID_rsassaPss;
#endif
#endif /* NO_RSA */
#ifdef HAVE_ECC
case CTC_SHAwECDSA:
@@ -35978,6 +35988,10 @@ int oid2nid(word32 oid, int grp)
#ifndef NO_RSA
case RSAk:
return NID_rsaEncryption;
#ifdef WC_RSA_PSS
case RSAPSSk:
return NID_rsassaPss;
#endif
#endif /* NO_RSA */
#ifdef HAVE_ECC
case ECDSAk: