mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-11-17 02:23:27 +03:00
Merge pull request #10439 from bjwtaylor/remove-all-non-ext-apis
Remove all non ext apis
This commit is contained in:
@@ -1436,11 +1436,6 @@ MBEDTLS_CHECK_RETURN_CRITICAL
|
||||
int mbedtls_ssl_write_handshake_msg_ext(mbedtls_ssl_context *ssl,
|
||||
int update_checksum,
|
||||
int force_flush);
|
||||
static inline int mbedtls_ssl_write_handshake_msg(mbedtls_ssl_context *ssl)
|
||||
{
|
||||
return mbedtls_ssl_write_handshake_msg_ext(ssl, 1 /* update checksum */, 1 /* force flush */);
|
||||
}
|
||||
|
||||
/*
|
||||
* Write handshake message tail
|
||||
*/
|
||||
@@ -1515,8 +1510,8 @@ static inline mbedtls_svc_key_id_t mbedtls_ssl_get_opaque_psk(
|
||||
|
||||
#if defined(MBEDTLS_PK_C)
|
||||
unsigned char mbedtls_ssl_sig_from_pk(mbedtls_pk_context *pk);
|
||||
unsigned char mbedtls_ssl_sig_from_pk_alg(mbedtls_pk_type_t type);
|
||||
mbedtls_pk_type_t mbedtls_ssl_pk_alg_from_sig(unsigned char sig);
|
||||
unsigned char mbedtls_ssl_sig_from_pk_alg(mbedtls_pk_sigalg_t type);
|
||||
mbedtls_pk_sigalg_t mbedtls_ssl_pk_sig_alg_from_sig(unsigned char sig);
|
||||
#endif
|
||||
|
||||
mbedtls_md_type_t mbedtls_ssl_md_alg_from_hash(unsigned char hash);
|
||||
@@ -2414,13 +2409,13 @@ static inline int mbedtls_ssl_sig_alg_is_offered(const mbedtls_ssl_context *ssl,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int mbedtls_ssl_get_pk_type_and_md_alg_from_sig_alg(
|
||||
uint16_t sig_alg, mbedtls_pk_type_t *pk_type, mbedtls_md_type_t *md_alg)
|
||||
static inline int mbedtls_ssl_get_pk_sigalg_and_md_alg_from_sig_alg(
|
||||
uint16_t sig_alg, mbedtls_pk_sigalg_t *pk_type, mbedtls_md_type_t *md_alg)
|
||||
{
|
||||
*pk_type = mbedtls_ssl_pk_alg_from_sig(sig_alg & 0xff);
|
||||
*pk_type = mbedtls_ssl_pk_sig_alg_from_sig(sig_alg & 0xff);
|
||||
*md_alg = mbedtls_ssl_md_alg_from_hash((sig_alg >> 8) & 0xff);
|
||||
|
||||
if (*pk_type != MBEDTLS_PK_NONE && *md_alg != MBEDTLS_MD_NONE) {
|
||||
if (*pk_type != MBEDTLS_PK_SIGALG_NONE && *md_alg != MBEDTLS_MD_NONE) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -2429,19 +2424,19 @@ static inline int mbedtls_ssl_get_pk_type_and_md_alg_from_sig_alg(
|
||||
#if defined(PSA_WANT_ALG_SHA_256)
|
||||
case MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA256:
|
||||
*md_alg = MBEDTLS_MD_SHA256;
|
||||
*pk_type = MBEDTLS_PK_RSASSA_PSS;
|
||||
*pk_type = MBEDTLS_PK_SIGALG_RSA_PSS;
|
||||
break;
|
||||
#endif /* PSA_WANT_ALG_SHA_256 */
|
||||
#if defined(PSA_WANT_ALG_SHA_384)
|
||||
case MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA384:
|
||||
*md_alg = MBEDTLS_MD_SHA384;
|
||||
*pk_type = MBEDTLS_PK_RSASSA_PSS;
|
||||
*pk_type = MBEDTLS_PK_SIGALG_RSA_PSS;
|
||||
break;
|
||||
#endif /* PSA_WANT_ALG_SHA_384 */
|
||||
#if defined(PSA_WANT_ALG_SHA_512)
|
||||
case MBEDTLS_TLS1_3_SIG_RSA_PSS_RSAE_SHA512:
|
||||
*md_alg = MBEDTLS_MD_SHA512;
|
||||
*pk_type = MBEDTLS_PK_RSASSA_PSS;
|
||||
*pk_type = MBEDTLS_PK_SIGALG_RSA_PSS;
|
||||
break;
|
||||
#endif /* PSA_WANT_ALG_SHA_512 */
|
||||
#endif /* PSA_WANT_ALG_RSA_PSS */
|
||||
|
||||
Reference in New Issue
Block a user