mirror of
https://github.com/warmcat/libwebsockets.git
synced 2025-03-09 00:00:04 +01:00
mbedtls: auto adapt to changed session constant
This commit is contained in:
parent
816544f1d6
commit
e71398c02a
5 changed files with 9 additions and 0 deletions
|
@ -79,6 +79,7 @@
|
|||
#cmakedefine LWS_HAVE_mbedtls_ssl_set_verify
|
||||
#cmakedefine LWS_HAVE_mbedtls_x509_crt_parse_file
|
||||
#cmakedefine LWS_HAVE_MBEDTLS_NET_SOCKETS
|
||||
#cmakedefine LWS_HAVE_MBEDTLS_SSL_NEW_SESSION_TICKET
|
||||
#cmakedefine LWS_HAVE_MBEDTLS_AUTH_KEY_ID
|
||||
#cmakedefine LWS_HAVE_NEW_UV_VERSION_H
|
||||
#cmakedefine LWS_HAVE_OPENSSL_ECDH_H
|
||||
|
|
|
@ -371,6 +371,7 @@ if (DEFINED LWS_PLAT_UNIX)
|
|||
endif()
|
||||
endif()
|
||||
set(LWS_HAVE_MBEDTLS_NET_SOCKETS ${LWS_HAVE_MBEDTLS_NET_SOCKETS} PARENT_SCOPE)
|
||||
set(LWS_HAVE_MBEDTLS_SSL_NEW_SESSION_TICKET ${LWS_HAVE_MBEDTLS_SSL_NEW_SESSION_TICKET} PARENT_SCOPE)
|
||||
set(TEST_SERVER_SSL_KEY "${TEST_SERVER_SSL_KEY}" PARENT_SCOPE)
|
||||
set(TEST_SERVER_SSL_CERT "${TEST_SERVER_SSL_CERT}" PARENT_SCOPE)
|
||||
set(TEST_SERVER_DATA ${TEST_SERVER_DATA} PARENT_SCOPE)
|
||||
|
|
|
@ -570,6 +570,7 @@ endif()
|
|||
|
||||
exports_to_parent_scope()
|
||||
set(LWS_HAVE_MBEDTLS_NET_SOCKETS ${LWS_HAVE_MBEDTLS_NET_SOCKETS} PARENT_SCOPE)
|
||||
set(LWS_HAVE_MBEDTLS_SSL_NEW_SESSION_TICKET ${LWS_HAVE_MBEDTLS_SSL_NEW_SESSION_TICKET} PARENT_SCOPE)
|
||||
set(TEST_SERVER_SSL_KEY "${TEST_SERVER_SSL_KEY}" PARENT_SCOPE)
|
||||
set(TEST_SERVER_SSL_CERT "${TEST_SERVER_SSL_CERT}" PARENT_SCOPE)
|
||||
set(TEST_SERVER_DATA ${TEST_SERVER_DATA} PARENT_SCOPE)
|
||||
|
|
|
@ -124,6 +124,7 @@ include_directories(wrapper/include wrapper/include/internal)
|
|||
# old mbedtls has everything in mbedtls/net.h
|
||||
|
||||
CHECK_C_SOURCE_COMPILES("#include <mbedtls/net_sockets.h>\nint main(void) { return 0;}\n" LWS_HAVE_MBEDTLS_NET_SOCKETS)
|
||||
CHECK_C_SOURCE_COMPILES("#include <mbedtls/ssl.h>\nint main(void) { return MBEDTLS_SSL_NEW_SESSION_TICKET;}\n" LWS_HAVE_MBEDTLS_SSL_NEW_SESSION_TICKET)
|
||||
|
||||
#
|
||||
# Keep explicit parent scope exports at end
|
||||
|
@ -131,3 +132,4 @@ CHECK_C_SOURCE_COMPILES("#include <mbedtls/net_sockets.h>\nint main(void) { retu
|
|||
|
||||
exports_to_parent_scope()
|
||||
set(LWS_HAVE_MBEDTLS_NET_SOCKETS ${LWS_HAVE_MBEDTLS_NET_SOCKETS} PARENT_SCOPE)
|
||||
set(LWS_HAVE_MBEDTLS_SSL_NEW_SESSION_TICKET ${LWS_HAVE_MBEDTLS_SSL_NEW_SESSION_TICKET} PARENT_SCOPE)
|
||||
|
|
|
@ -549,7 +549,11 @@ OSSL_HANDSHAKE_STATE ssl_pm_get_state(const SSL *ssl)
|
|||
case MBEDTLS_SSL_SERVER_KEY_EXCHANGE:
|
||||
state = TLS_ST_SR_KEY_EXCH;
|
||||
break;
|
||||
#if defined(LWS_HAVE_MBEDTLS_SSL_NEW_SESSION_TICKET)
|
||||
case MBEDTLS_SSL_NEW_SESSION_TICKET:
|
||||
#else
|
||||
case MBEDTLS_SSL_SERVER_NEW_SESSION_TICKET:
|
||||
#endif
|
||||
state = TLS_ST_SW_SESSION_TICKET;
|
||||
break;
|
||||
case MBEDTLS_SSL_SERVER_HELLO_VERIFY_REQUEST_SENT:
|
||||
|
|
Loading…
Add table
Reference in a new issue