From d20cce0a54f3b00cbd0612b2df7c93f3ff25f85a Mon Sep 17 00:00:00 2001 From: Joseph Birr-Pixton Date: Tue, 23 Apr 2024 16:18:40 +0100 Subject: [PATCH] Ignore calls to `SSL_CTX_set_session_id_context` Later commits will implement this, and session resumption more generally. --- rustls-libssl/MATRIX.md | 2 +- rustls-libssl/src/entry.rs | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/rustls-libssl/MATRIX.md b/rustls-libssl/MATRIX.md index f5afd18..353c573 100644 --- a/rustls-libssl/MATRIX.md +++ b/rustls-libssl/MATRIX.md @@ -179,7 +179,7 @@ | `SSL_CTX_set_recv_max_early_data` | | | | | `SSL_CTX_set_security_callback` | | | | | `SSL_CTX_set_security_level` | | | | -| `SSL_CTX_set_session_id_context` | | :white_check_mark: | :exclamation: [^stub] | +| `SSL_CTX_set_session_id_context` | | :white_check_mark: | :white_check_mark: | | `SSL_CTX_set_session_ticket_cb` | | | | | `SSL_CTX_set_srp_cb_arg` [^deprecatedin_3_0] [^srp] | | | | | `SSL_CTX_set_srp_client_pwd_callback` [^deprecatedin_3_0] [^srp] | | | | diff --git a/rustls-libssl/src/entry.rs b/rustls-libssl/src/entry.rs index 24b41a9..1987f82 100644 --- a/rustls-libssl/src/entry.rs +++ b/rustls-libssl/src/entry.rs @@ -636,6 +636,17 @@ entry! { } } +entry! { + pub fn _SSL_CTX_set_session_id_context( + _ctx: *mut SSL_CTX, + _sid_ctx: *const c_uchar, + _sid_ctx_len: c_uint, + ) -> c_int { + log::warn!("SSL_CTX_set_session_id_context not yet implemented"); + C_INT_SUCCESS + } +} + impl Castable for SSL_CTX { type Ownership = OwnershipArc; type RustType = NotThreadSafe; @@ -1556,15 +1567,6 @@ pub type SSL_CTX_sess_remove_cb = Option; entry_stub! { - pub fn _SSL_CTX_set_session_id_context( - _ctx: *mut SSL_CTX, - _sid_ctx: *const c_uchar, - _sid_ctx_len: c_uint, - ) -> c_int; -} - -entry_stub! { - pub fn _SSL_set_session_id_context( _ssl: *mut SSL, _sid_ctx: *const c_uchar,