mirror of
https://github.com/ARMmbed/mbedtls.git
synced 2025-10-19 11:24:41 +08:00
removed mbedtls_ssl_conf_sig_hashes and temporarily re-add sig_hashes
Signed-off-by: Ben Taylor <ben.taylor@linaro.org>
This commit is contained in:
@@ -1486,6 +1486,9 @@ struct mbedtls_ssl_config {
|
|||||||
|
|
||||||
#if defined(MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED)
|
#if defined(MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED)
|
||||||
|
|
||||||
|
#if !defined(MBEDTLS_DEPRECATED_REMOVED)
|
||||||
|
const int *MBEDTLS_PRIVATE(sig_hashes); /*!< allowed signature hashes */
|
||||||
|
#endif
|
||||||
const uint16_t *MBEDTLS_PRIVATE(sig_algs); /*!< allowed signature algorithms */
|
const uint16_t *MBEDTLS_PRIVATE(sig_algs); /*!< allowed signature algorithms */
|
||||||
#endif /* MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED */
|
#endif /* MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED */
|
||||||
|
|
||||||
|
@@ -2420,16 +2420,6 @@ psa_status_t mbedtls_ssl_cipher_to_psa(mbedtls_cipher_type_t mbedtls_cipher_type
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if defined(MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED)
|
#if defined(MBEDTLS_SSL_HANDSHAKE_WITH_CERT_ENABLED)
|
||||||
#if !defined(MBEDTLS_DEPRECATED_REMOVED) && defined(MBEDTLS_SSL_PROTO_TLS1_2)
|
|
||||||
/*
|
|
||||||
* Set allowed/preferred hashes for handshake signatures
|
|
||||||
*/
|
|
||||||
void mbedtls_ssl_conf_sig_hashes(mbedtls_ssl_config *conf,
|
|
||||||
const int *hashes)
|
|
||||||
{
|
|
||||||
conf->sig_hashes = hashes;
|
|
||||||
}
|
|
||||||
#endif /* !MBEDTLS_DEPRECATED_REMOVED && MBEDTLS_SSL_PROTO_TLS1_2 */
|
|
||||||
|
|
||||||
/* Configure allowed signature algorithms for handshake */
|
/* Configure allowed signature algorithms for handshake */
|
||||||
void mbedtls_ssl_conf_sig_algs(mbedtls_ssl_config *conf,
|
void mbedtls_ssl_conf_sig_algs(mbedtls_ssl_config *conf,
|
||||||
|
Reference in New Issue
Block a user