Merge 340ff5cf9565b830a51c3381325f7d696587e57d into 03e1438089654fb884ac48e0f3cd0049cfe2c102

This commit is contained in:
Ben Taylor 2026-10-27 10:45:59 -04:00 committed by GitHub
commit b001c789f0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 1049 additions and 1041 deletions

View File

@ -11,11 +11,10 @@
#ifndef MBEDTLS_SSL_DEBUG_HELPERS_H
#define MBEDTLS_SSL_DEBUG_HELPERS_H
#include "ssl_misc.h"
#if defined(MBEDTLS_DEBUG_C)
#include "mbedtls/ssl.h"
#include "ssl_types.h"
const char *mbedtls_ssl_states_str(mbedtls_ssl_states in);

File diff suppressed because it is too large Load Diff

View File

@ -6617,11 +6617,8 @@ int ssl_calc_verify_tls_sha384(const mbedtls_ssl_context *ssl,
}
#endif /* PSA_WANT_ALG_SHA_384 */
#if defined(MBEDTLS_SSL_SRV_C) && defined(MBEDTLS_SSL_RENEGOTIATION)
MBEDTLS_CHECK_RETURN_CRITICAL
static int ssl_write_hello_request(mbedtls_ssl_context *ssl);
#if defined(MBEDTLS_SSL_PROTO_DTLS)
#if defined(MBEDTLS_SSL_SRV_C) && defined(MBEDTLS_SSL_RENEGOTIATION) && \
defined(MBEDTLS_SSL_PROTO_DTLS)
int mbedtls_ssl_resend_hello_request(mbedtls_ssl_context *ssl)
{
/* If renegotiation is not enforced, retransmit until we would reach max
@ -6643,8 +6640,7 @@ int mbedtls_ssl_resend_hello_request(mbedtls_ssl_context *ssl)
return ssl_write_hello_request(ssl);
}
#endif
#endif /* MBEDTLS_SSL_SRV_C && MBEDTLS_SSL_RENEGOTIATION */
#endif /* MBEDTLS_SSL_SRV_C && MBEDTLS_SSL_RENEGOTIATION && MBEDTLS_SSL_PROTO_DTLS*/
/*
* Handshake functions

1040
library/ssl_types.h Normal file

File diff suppressed because it is too large Load Diff