mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-11-24 12:01:11 +03:00
Merge pull request #9171 from eleuzi01/replace-mbedtls-md-can-sha384
Replace MBEDTLS_MD_CAN_SHA384 with PSA_WANT_ALG_SHA_384
This commit is contained in:
@@ -405,13 +405,13 @@ static const oid_sig_alg_t oid_sig_alg[] =
|
||||
MBEDTLS_MD_SHA256, MBEDTLS_PK_RSA,
|
||||
},
|
||||
#endif /* MBEDTLS_MD_CAN_SHA256 */
|
||||
#if defined(MBEDTLS_MD_CAN_SHA384)
|
||||
#if defined(PSA_WANT_ALG_SHA_384)
|
||||
{
|
||||
OID_DESCRIPTOR(MBEDTLS_OID_PKCS1_SHA384, "sha384WithRSAEncryption",
|
||||
"RSA with SHA-384"),
|
||||
MBEDTLS_MD_SHA384, MBEDTLS_PK_RSA,
|
||||
},
|
||||
#endif /* MBEDTLS_MD_CAN_SHA384 */
|
||||
#endif /* PSA_WANT_ALG_SHA_384 */
|
||||
#if defined(MBEDTLS_MD_CAN_SHA512)
|
||||
{
|
||||
OID_DESCRIPTOR(MBEDTLS_OID_PKCS1_SHA512, "sha512WithRSAEncryption",
|
||||
@@ -445,12 +445,12 @@ static const oid_sig_alg_t oid_sig_alg[] =
|
||||
MBEDTLS_MD_SHA256, MBEDTLS_PK_ECDSA,
|
||||
},
|
||||
#endif /* MBEDTLS_MD_CAN_SHA256 */
|
||||
#if defined(MBEDTLS_MD_CAN_SHA384)
|
||||
#if defined(PSA_WANT_ALG_SHA_384)
|
||||
{
|
||||
OID_DESCRIPTOR(MBEDTLS_OID_ECDSA_SHA384, "ecdsa-with-SHA384", "ECDSA with SHA384"),
|
||||
MBEDTLS_MD_SHA384, MBEDTLS_PK_ECDSA,
|
||||
},
|
||||
#endif /* MBEDTLS_MD_CAN_SHA384 */
|
||||
#endif /* PSA_WANT_ALG_SHA_384 */
|
||||
#if defined(MBEDTLS_MD_CAN_SHA512)
|
||||
{
|
||||
OID_DESCRIPTOR(MBEDTLS_OID_ECDSA_SHA512, "ecdsa-with-SHA512", "ECDSA with SHA512"),
|
||||
@@ -743,7 +743,7 @@ static const oid_md_alg_t oid_md_alg[] =
|
||||
MBEDTLS_MD_SHA256,
|
||||
},
|
||||
#endif
|
||||
#if defined(MBEDTLS_MD_CAN_SHA384)
|
||||
#if defined(PSA_WANT_ALG_SHA_384)
|
||||
{
|
||||
OID_DESCRIPTOR(MBEDTLS_OID_DIGEST_ALG_SHA384, "id-sha384", "SHA-384"),
|
||||
MBEDTLS_MD_SHA384,
|
||||
@@ -827,12 +827,12 @@ static const oid_md_hmac_t oid_md_hmac[] =
|
||||
MBEDTLS_MD_SHA256,
|
||||
},
|
||||
#endif /* MBEDTLS_MD_CAN_SHA256 */
|
||||
#if defined(MBEDTLS_MD_CAN_SHA384)
|
||||
#if defined(PSA_WANT_ALG_SHA_384)
|
||||
{
|
||||
OID_DESCRIPTOR(MBEDTLS_OID_HMAC_SHA384, "hmacSHA384", "HMAC-SHA-384"),
|
||||
MBEDTLS_MD_SHA384,
|
||||
},
|
||||
#endif /* MBEDTLS_MD_CAN_SHA384 */
|
||||
#endif /* PSA_WANT_ALG_SHA_384 */
|
||||
#if defined(MBEDTLS_MD_CAN_SHA512)
|
||||
{
|
||||
OID_DESCRIPTOR(MBEDTLS_OID_HMAC_SHA512, "hmacSHA512", "HMAC-SHA-512"),
|
||||
|
||||
Reference in New Issue
Block a user