From 28e7504a120f87e422fa8f1bf308485a281134b8 Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Sun, 2 Feb 2025 17:17:20 -0500 Subject: [PATCH] move token store definition to quic_predef.h MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Matt Caswell Reviewed-by: Saša Nedvědický (Merged from https://github.com/openssl/openssl/pull/26517) --- include/internal/quic_predef.h | 1 + include/openssl/ssl.h.in | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/include/internal/quic_predef.h b/include/internal/quic_predef.h index 4169b091355..b7658b57195 100644 --- a/include/internal/quic_predef.h +++ b/include/internal/quic_predef.h @@ -12,6 +12,7 @@ # ifndef OPENSSL_NO_QUIC +typedef struct ssl_token_store_st SSL_TOKEN_STORE; typedef struct quic_port_st QUIC_PORT; typedef struct quic_channel_st QUIC_CHANNEL; typedef struct quic_tls_st QUIC_TLS; diff --git a/include/openssl/ssl.h.in b/include/openssl/ssl.h.in index 71eed52a5cf..9ba1ab21f4d 100644 --- a/include/openssl/ssl.h.in +++ b/include/openssl/ssl.h.in @@ -2285,7 +2285,6 @@ int SSL_CTX_set_num_tickets(SSL_CTX *ctx, size_t num_tickets); size_t SSL_CTX_get_num_tickets(const SSL_CTX *ctx); /* QUIC support */ -typedef struct ssl_token_store_st SSL_TOKEN_STORE; int SSL_handle_events(SSL *s); __owur int SSL_get_event_timeout(SSL *s, struct timeval *tv, int *is_infinite); __owur int SSL_get_rpoll_descriptor(SSL *s, BIO_POLL_DESCRIPTOR *desc); -- 2.47.2