From 2525109f90cf3a91a909621266ec6854a83805e2 Mon Sep 17 00:00:00 2001 From: Hugo Landau Date: Mon, 12 Jun 2023 14:13:33 +0100 Subject: QUIC: Allow application to trigger TXKU Reviewed-by: Tomas Mraz Reviewed-by: Matt Caswell Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/21029) --- include/internal/quic_channel.h | 3 +++ include/internal/quic_ssl.h | 2 ++ 2 files changed, 5 insertions(+) (limited to 'include/internal') diff --git a/include/internal/quic_channel.h b/include/internal/quic_channel.h index 99e3dd6c76..deade706af 100644 --- a/include/internal/quic_channel.h +++ b/include/internal/quic_channel.h @@ -338,6 +338,9 @@ void ossl_quic_channel_set_txku_threshold_override(QUIC_CHANNEL *ch, uint64_t ossl_quic_channel_get_tx_key_epoch(QUIC_CHANNEL *ch); uint64_t ossl_quic_channel_get_rx_key_epoch(QUIC_CHANNEL *ch); +/* Artificially trigger a spontaneous TXKU if possible. */ +int ossl_quic_channel_trigger_txku(QUIC_CHANNEL *ch); + # endif #endif diff --git a/include/internal/quic_ssl.h b/include/internal/quic_ssl.h index ed69a80057..28047f985c 100644 --- a/include/internal/quic_ssl.h +++ b/include/internal/quic_ssl.h @@ -34,6 +34,8 @@ __owur long ossl_quic_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg); __owur long ossl_quic_callback_ctrl(SSL *s, int cmd, void (*fp) (void)); __owur long ossl_quic_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp) (void)); __owur size_t ossl_quic_pending(const SSL *s); +__owur int ossl_quic_key_update(SSL *s, int update_type); +__owur int ossl_quic_get_key_update_type(const SSL *s); __owur int ossl_quic_num_ciphers(void); __owur const SSL_CIPHER *ossl_quic_get_cipher(unsigned int u); int ossl_quic_renegotiate_check(SSL *ssl, int initok); -- cgit v1.2.3