Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Server-side resumption support #13

Merged
merged 16 commits into from
Apr 30, 2024
Merged

Server-side resumption support #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
67cbfe7
Introduce `SSL_SESSION` type and functions:
ctz Apr 26, 2024
e5142c8
Implement cache modes and sizing
ctz Apr 26, 2024
38085b0
Hook up `SessionCaches` to client connections
ctz Apr 26, 2024
8a1586f
Implement `SSL_CTX_{get,set}_timeout`
ctz Apr 26, 2024
ff79a69
Implement `SSL_CTX_sess_set_{get,new,remove}_cb` plumbing
ctz Apr 26, 2024
d67fbbd
Ensure `ServerSessionStorage` knows its containing SSL_CTX*
ctz Apr 26, 2024
c8171e8
Hook up `SSL_CTX_set_session_id_context`
ctz Apr 26, 2024
da4bb6e
Hook up `SessionCaches` to server connections
ctz Apr 26, 2024
dcfea98
Implement `SSL_get_session` & `SSL_get1_session`
ctz Apr 26, 2024
e917cd3
Ensure session remove callback happens during `SSL_CTX_free`
ctz Apr 26, 2024
9e0d50d
server.c: observe session callback behaviour
ctz Apr 26, 2024
6eacc33
cache.rs: implement auto-clearing behaviour
ctz Apr 26, 2024
f523956
cache.rs: respect maximum cache size
ctz Apr 26, 2024
4951c39
cache.rs: refuse to use sessions with wrong context
ctz Apr 26, 2024
c558419
cache.rs: respect size == 0 special case
ctz Apr 30, 2024
1b26307
Tests nginx resumption across cache options
ctz Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions rustls-libssl/MATRIX.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
| `SSL_CTX_get_security_callback` | | | |
| `SSL_CTX_get_security_level` | | | |
| `SSL_CTX_get_ssl_method` | | | |
| `SSL_CTX_get_timeout` | | :white_check_mark: | :exclamation: [^stub] |
| `SSL_CTX_get_timeout` | | :white_check_mark: | :white_check_mark: |
| `SSL_CTX_get_verify_callback` | | :white_check_mark: | :white_check_mark: |
| `SSL_CTX_get_verify_depth` | | :white_check_mark: | :white_check_mark: |
| `SSL_CTX_get_verify_mode` | | :white_check_mark: | :white_check_mark: |
Expand All @@ -119,9 +119,9 @@
| `SSL_CTX_sess_get_get_cb` | | | |
| `SSL_CTX_sess_get_new_cb` | | | |
| `SSL_CTX_sess_get_remove_cb` | | | |
| `SSL_CTX_sess_set_get_cb` | | :white_check_mark: | :exclamation: [^stub] |
| `SSL_CTX_sess_set_new_cb` | :white_check_mark: | :white_check_mark: | :exclamation: [^stub] |
| `SSL_CTX_sess_set_remove_cb` | | :white_check_mark: | :exclamation: [^stub] |
| `SSL_CTX_sess_set_get_cb` | | :white_check_mark: | :white_check_mark: |
| `SSL_CTX_sess_set_new_cb` | :white_check_mark: | :white_check_mark: | :white_check_mark: |
| `SSL_CTX_sess_set_remove_cb` | | :white_check_mark: | :white_check_mark: |
| `SSL_CTX_sessions` | | | |
| `SSL_CTX_set0_CA_list` | | | |
| `SSL_CTX_set0_ctlog_store` [^ct] | | | |
Expand Down Expand Up @@ -191,7 +191,7 @@
| `SSL_CTX_set_ssl_version` [^deprecatedin_3_0] | | | |
| `SSL_CTX_set_stateless_cookie_generate_cb` | | | |
| `SSL_CTX_set_stateless_cookie_verify_cb` | | | |
| `SSL_CTX_set_timeout` | | :white_check_mark: | :exclamation: [^stub] |
| `SSL_CTX_set_timeout` | | :white_check_mark: | :white_check_mark: |
| `SSL_CTX_set_tlsext_max_fragment_length` | | | |
| `SSL_CTX_set_tlsext_ticket_key_evp_cb` | | | |
| `SSL_CTX_set_tlsext_use_srtp` [^srtp] | | | |
Expand All @@ -216,7 +216,7 @@
| `SSL_CTX_use_serverinfo_ex` | | | |
| `SSL_CTX_use_serverinfo_file` | | | |
| `SSL_SESSION_dup` | | | |
| `SSL_SESSION_free` | :white_check_mark: | :white_check_mark: | :exclamation: [^stub] |
| `SSL_SESSION_free` | :white_check_mark: | :white_check_mark: | :white_check_mark: |
| `SSL_SESSION_get0_alpn_selected` | | | |
| `SSL_SESSION_get0_cipher` | | | |
| `SSL_SESSION_get0_hostname` | | | |
Expand All @@ -226,7 +226,7 @@
| `SSL_SESSION_get0_ticket_appdata` | | | |
| `SSL_SESSION_get_compress_id` | | | |
| `SSL_SESSION_get_ex_data` | | | |
| `SSL_SESSION_get_id` | | :white_check_mark: | :exclamation: [^stub] |
| `SSL_SESSION_get_id` | | :white_check_mark: | :white_check_mark: |
| `SSL_SESSION_get_master_key` | | | |
| `SSL_SESSION_get_max_early_data` | | | |
| `SSL_SESSION_get_max_fragment_length` | | | |
Expand All @@ -252,7 +252,7 @@
| `SSL_SESSION_set_protocol_version` | | | |
| `SSL_SESSION_set_time` | | | |
| `SSL_SESSION_set_timeout` | | | |
| `SSL_SESSION_up_ref` | | :white_check_mark: | :exclamation: [^stub] |
| `SSL_SESSION_up_ref` | | :white_check_mark: | :white_check_mark: |
| `SSL_SRP_CTX_free` [^deprecatedin_3_0] [^srp] | | | |
| `SSL_SRP_CTX_init` [^deprecatedin_3_0] [^srp] | | | |
| `SSL_accept` | | | :white_check_mark: |
Expand Down Expand Up @@ -316,7 +316,7 @@
| `SSL_get0_security_ex_data` | | | |
| `SSL_get0_verified_chain` | | | :white_check_mark: |
| `SSL_get1_peer_certificate` | :white_check_mark: | :white_check_mark: | :white_check_mark: |
| `SSL_get1_session` | | :white_check_mark: | :exclamation: [^stub] |
| `SSL_get1_session` | | :white_check_mark: | :white_check_mark: |
| `SSL_get1_supported_ciphers` | | | |
| `SSL_get_SSL_CTX` | | | |
| `SSL_get_all_async_fds` | | | |
Expand Down Expand Up @@ -364,7 +364,7 @@
| `SSL_get_server_random` | | | |
| `SSL_get_servername` | | :white_check_mark: | :white_check_mark: |
| `SSL_get_servername_type` | | | :white_check_mark: |
| `SSL_get_session` | | :white_check_mark: | :exclamation: [^stub] |
| `SSL_get_session` | | :white_check_mark: | :white_check_mark: |
| `SSL_get_shared_ciphers` | | | |
| `SSL_get_shared_sigalgs` | | | |
| `SSL_get_shutdown` | :white_check_mark: | :white_check_mark: | :white_check_mark: |
Expand Down Expand Up @@ -461,7 +461,7 @@
| `SSL_set_security_callback` | | | |
| `SSL_set_security_level` | | | |
| `SSL_set_session` | :white_check_mark: | :white_check_mark: | :exclamation: [^stub] |
| `SSL_set_session_id_context` | | | :exclamation: [^stub] |
| `SSL_set_session_id_context` | | | |
| `SSL_set_session_secret_cb` | | | |
| `SSL_set_session_ticket_ext` | | | |
| `SSL_set_session_ticket_ext_cb` | | | |
Expand Down Expand Up @@ -519,8 +519,8 @@
| `TLSv1_client_method` [^deprecatedin_1_1_0] [^tls1_method] | | | |
| `TLSv1_method` [^deprecatedin_1_1_0] [^tls1_method] | | | |
| `TLSv1_server_method` [^deprecatedin_1_1_0] [^tls1_method] | | | |
| `d2i_SSL_SESSION` | | :white_check_mark: | :exclamation: [^stub] |
| `i2d_SSL_SESSION` | | :white_check_mark: | :exclamation: [^stub] |
| `d2i_SSL_SESSION` | | :white_check_mark: | :white_check_mark: |
| `i2d_SSL_SESSION` | | :white_check_mark: | :white_check_mark: |

[^stub]: symbol exists, but just returns an error.
[^deprecatedin_1_1_0]: deprecated in openssl 1.1.0
Expand Down
1 change: 0 additions & 1 deletion rustls-libssl/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ const ENTRYPOINTS: &[&str] = &[
"SSL_set_post_handshake_auth",
"SSL_set_quiet_shutdown",
"SSL_set_session",
"SSL_set_session_id_context",
"SSL_set_shutdown",
"SSL_set_SSL_CTX",
"SSL_set_verify",
Expand Down
Loading