diff options
| author | Hugo Landau <hlandau@openssl.org> | 2023-04-18 19:30:53 +0100 |
|---|---|---|
| committer | Hugo Landau <hlandau@openssl.org> | 2023-05-12 14:46:03 +0100 |
| commit | f8636c7e85229bf780da7cf61c234695952f8cad (patch) | |
| tree | 3b4804ddf353847a127f7e3fea2b78af37dc469b /ssl/ssl_lib.c | |
| parent | e88cdb8eb7b719803aaaef853db16abf3a4e73d1 (diff) | |
QUIC Dispatch: Introduce the QUIC_XSO object
The QUIC_XSO (external stream object) is to a QUIC stream what a
QUIC_CONNECTION is to a QUIC connection. Both are SSL objects. The
QUIC_CONNECTION type is the internal representation of a QUIC connection
SSL object (QCSO) and the QUIC_XSO type is the internal representation
of a QUIC stream SSL object (QSSO) type. The name QUIC_XSO has been
chosen to be distinct from the existing QUIC_STREAM type which is our
existing internal stream type. QUIC_XSO is to a QUIC_STREAM what
QUIC_CONNECTION is to a QUIC_CHANNEL; in other words, QUIC_CONNECTION
and QUIC_XSO objects form part of the API personality layer, whereas
QUIC_CHANNEL and QUIC_STREAM objects form part of the QUIC core and are
distinct from the API personality layer.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20765)
Diffstat (limited to 'ssl/ssl_lib.c')
| -rw-r--r-- | ssl/ssl_lib.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index ed70023bcd..8a6b9861e8 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -931,7 +931,7 @@ int SSL_is_dtls(const SSL *s) SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); #ifndef OPENSSL_NO_QUIC - if (s->type == SSL_TYPE_QUIC_CONNECTION || s->type == SSL_TYPE_QUIC_STREAM) + if (s->type == SSL_TYPE_QUIC_CONNECTION || s->type == SSL_TYPE_QUIC_XSO) return 0; #endif @@ -946,7 +946,7 @@ int SSL_is_tls(const SSL *s) SSL_CONNECTION *sc = SSL_CONNECTION_FROM_SSL(s); #ifndef OPENSSL_NO_QUIC - if (s->type == SSL_TYPE_QUIC_CONNECTION || s->type == SSL_TYPE_QUIC_STREAM) + if (s->type == SSL_TYPE_QUIC_CONNECTION || s->type == SSL_TYPE_QUIC_XSO) return 0; #endif @@ -959,7 +959,7 @@ int SSL_is_tls(const SSL *s) int SSL_is_quic(const SSL *s) { #ifndef OPENSSL_NO_QUIC - if (s->type == SSL_TYPE_QUIC_CONNECTION || s->type == SSL_TYPE_QUIC_STREAM) + if (s->type == SSL_TYPE_QUIC_CONNECTION || s->type == SSL_TYPE_QUIC_XSO) return 1; #endif return 0; @@ -4774,7 +4774,7 @@ const char *SSL_get_version(const SSL *s) #ifndef OPENSSL_NO_QUIC /* We only support QUICv1 - so if its QUIC its QUICv1 */ - if (s->type == SSL_TYPE_QUIC_CONNECTION || s->type == SSL_TYPE_QUIC_STREAM) + if (s->type == SSL_TYPE_QUIC_CONNECTION || s->type == SSL_TYPE_QUIC_XSO) return "QUICv1"; #endif @@ -5116,7 +5116,7 @@ int SSL_version(const SSL *s) #ifndef OPENSSL_NO_QUIC /* We only support QUICv1 - so if its QUIC its QUICv1 */ - if (s->type == SSL_TYPE_QUIC_CONNECTION || s->type == SSL_TYPE_QUIC_STREAM) + if (s->type == SSL_TYPE_QUIC_CONNECTION || s->type == SSL_TYPE_QUIC_XSO) return OSSL_QUIC1_VERSION; #endif /* TODO(QUIC): Do we want to report QUIC version this way instead? */ |