Skip to content

Commit 3cab908

Browse files
committed
Revert "ssl: server-side TLS session tickets (abbreviated handshakes); opt-console: HW SHA/AES"
This reverts commit 216c71c.
1 parent 58140f6 commit 3cab908

2 files changed

Lines changed: 0 additions & 20 deletions

File tree

ports/espressif/esp-idf-config/sdkconfig-wifidebug-opt.defaults

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,3 @@ CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=4096
1515
CONFIG_MBEDTLS_DYNAMIC_BUFFER=y
1616
CONFIG_MBEDTLS_DYNAMIC_FREE_PEER_CERT=y
1717
CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y
18-
CONFIG_MBEDTLS_HARDWARE_SHA=y
19-
CONFIG_MBEDTLS_HARDWARE_AES=y

shared-module/ssl/SSLSocket.c

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "shared-bindings/socketpool/enum.h"
2222

2323
#include "mbedtls/version.h"
24-
#include "mbedtls/ssl_ticket.h" /* CP-TLS-TICKETS */
2524

2625
#define MP_STREAM_POLL_RDWR (MP_STREAM_POLL_RD | MP_STREAM_POLL_WR)
2726

@@ -328,23 +327,6 @@ ssl_sslsocket_obj_t *common_hal_ssl_sslcontext_wrap_socket(ssl_sslcontext_obj_t
328327
goto cleanup;
329328
}
330329
}
331-
#if defined(MBEDTLS_SSL_SESSION_TICKETS) && defined(MBEDTLS_SSL_TICKET_C) /* CP-TLS-TICKETS */
332-
if (server_side) {
333-
// Session tickets let a returning client resume without the (expensive) public-key
334-
// handshake. One process-wide ticket key, rotated by lifetime; nothing to persist.
335-
static mbedtls_ssl_ticket_context ticket_ctx;
336-
static bool ticket_ready = false;
337-
if (!ticket_ready) {
338-
mbedtls_ssl_ticket_init(&ticket_ctx);
339-
if (mbedtls_ssl_ticket_setup(&ticket_ctx, PSA_ALG_GCM, PSA_KEY_TYPE_AES, 256, 86400) == 0) {
340-
ticket_ready = true;
341-
}
342-
}
343-
if (ticket_ready) {
344-
mbedtls_ssl_conf_session_tickets_cb(&o->conf, mbedtls_ssl_ticket_write, mbedtls_ssl_ticket_parse, &ticket_ctx);
345-
}
346-
}
347-
#endif
348330
return o;
349331
cleanup:
350332
mbedtls_pk_free(&o->pkey);

0 commit comments

Comments
 (0)