mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-31 20:10:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the use of CCM ciphersuites with QUIC TLS API

Browse Source 
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27091)
This commit is contained in:
Matt Caswell 2025-03-18 14:36:28 +00:00 committed by Tomas Mraz
parent 366b2643cb
commit 207cd5bb97
8 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/internal/ssl.h
View File

@ -20,5 +20,7 @@ int ossl_ssl_get_error(const SSL *s, int i, int check_err);
/* Set if this is the QUIC handshake layer */
# define TLS1_FLAGS_QUIC 0x2000
/* Set if this is our QUIC handshake layer */
# define TLS1_FLAGS_QUIC_INTERNAL 0x4000
#endif

1
include/openssl/ssl3.h
View File

@ -308,6 +308,7 @@ extern "C" {
# define TLS1_FLAGS_REQUIRED_EXTMS 0x1000
/* 0x2000 is reserved for TLS1_FLAGS_QUIC (internal) */
/* 0x4000 is reserved for TLS1_FLAGS_QUIC_INTERNAL (internal) */
# define SSL3_MT_HELLO_REQUEST 0
# define SSL3_MT_CLIENT_HELLO 1

4
ssl/quic/quic_impl.c
View File

@ -583,7 +583,7 @@ SSL *ossl_quic_new(SSL_CTX *ctx)
}
/* override the user_ssl of the inner connection */
sc->s3.flags |= TLS1_FLAGS_QUIC;
sc->s3.flags |= TLS1_FLAGS_QUIC | TLS1_FLAGS_QUIC_INTERNAL;
/* Restrict options derived from the SSL_CTX. */
sc->options &= OSSL_QUIC_PERMITTED_OPTIONS_CONN;
@ -4436,7 +4436,7 @@ SSL *ossl_quic_new_from_listener(SSL *ssl, uint64_t flags)
QUIC_RAISE_NON_NORMAL_ERROR(NULL, ERR_R_INTERNAL_ERROR, NULL);
goto err;
}
sc->s3.flags |= TLS1_FLAGS_QUIC;
sc->s3.flags |= TLS1_FLAGS_QUIC | TLS1_FLAGS_QUIC_INTERNAL;
qc->default_ssl_options = OSSL_QUIC_PERMITTED_OPTIONS;
qc->last_error = SSL_ERROR_NONE;

2
ssl/quic/quic_port.c
View File

@ -490,7 +490,7 @@ static SSL *port_new_handshake_layer(QUIC_PORT *port, QUIC_CHANNEL *ch)
}
/* Override the user_ssl of the inner connection. */
tls_conn->s3.flags |= TLS1_FLAGS_QUIC;
tls_conn->s3.flags |= TLS1_FLAGS_QUIC | TLS1_FLAGS_QUIC_INTERNAL;
/* Restrict options derived from the SSL_CTX. */
tls_conn->options &= OSSL_QUIC_PERMITTED_OPTIONS_CONN;

2
ssl/quic/quic_tls.c
View File

@ -802,6 +802,8 @@ int ossl_quic_tls_tick(QUIC_TLS *qtls)
if (!ossl_quic_tls_configure(qtls))
return RAISE_INTERNAL_ERROR(qtls);
sc->s3.flags |= TLS1_FLAGS_QUIC_INTERNAL;
if (qtls->args.is_server)
SSL_set_accept_state(qtls->args.s);
else

2
ssl/s3_lib.c
View File

@ -3498,7 +3498,7 @@ int ssl3_clear(SSL *s)
* NULL/zero-out everything in the s3 struct, but remember if we are doing
* QUIC.
*/
flags = sc->s3.flags & TLS1_FLAGS_QUIC;
flags = sc->s3.flags & (TLS1_FLAGS_QUIC | TLS1_FLAGS_QUIC_INTERNAL);
memset(&sc->s3, 0, sizeof(sc->s3));
sc->s3.flags |= flags;

1
ssl/ssl_local.h
View File

@ -315,6 +315,7 @@
# define SSL_WRITE_ETM(s) (s->s3.flags & TLS1_FLAGS_ENCRYPT_THEN_MAC_WRITE)
# define SSL_IS_QUIC_HANDSHAKE(s) (((s)->s3.flags & TLS1_FLAGS_QUIC) != 0)
# define SSL_IS_QUIC_INT_HANDSHAKE(s) (((s)->s3.flags & TLS1_FLAGS_QUIC_INTERNAL) != 0)
/* no end of early data */
# define SSL_NO_EOED(s) SSL_IS_QUIC_HANDSHAKE(s)

2
ssl/t1_lib.c
View File

@ -2874,7 +2874,7 @@ int ssl_cipher_disabled(const SSL_CONNECTION *s, const SSL_CIPHER *c,
if (s->s3.tmp.max_ver == 0)
return 1;
if (SSL_IS_QUIC_HANDSHAKE(s))
if (SSL_IS_QUIC_INT_HANDSHAKE(s))
/* For QUIC, only allow these ciphersuites. */
switch (SSL_CIPHER_get_id(c)) {
case TLS1_3_CK_AES_128_GCM_SHA256: