Merging upstream version 4.23.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 47 insertions, 14 deletions

diff --git a/upstream/debian-unstable/man3/SSL_get_version.3ssl b/upstream/debian-unstable/man3/SSL_get_version.3ssl
index 0703329e..be1e1edc 100644
--- a/upstream/debian-unstable/man3/SSL_get_version.3ssl
+++ b/upstream/debian-unstable/man3/SSL_get_version.3ssl
@@ -55,14 +55,14 @@
 .\" ========================================================================
 .\"
 .IX Title "SSL_GET_VERSION 3SSL"
-.TH SSL_GET_VERSION 3SSL 2024-02-03 3.1.5 OpenSSL
+.TH SSL_GET_VERSION 3SSL 2024-04-04 3.2.2-dev OpenSSL
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH NAME
-SSL_client_version, SSL_get_version, SSL_is_dtls, SSL_version \- get the
-protocol information of a connection
+SSL_client_version, SSL_get_version, SSL_is_dtls, SSL_is_tls, SSL_is_quic,
+SSL_version \- get the protocol information of a connection
 .SH SYNOPSIS
 .IX Header "SYNOPSIS"
 .Vb 1
@@ -73,21 +73,29 @@ protocol information of a connection
 \& const char *SSL_get_version(const SSL *ssl);
 \&
 \& int SSL_is_dtls(const SSL *ssl);
+\& int SSL_is_tls(const SSL *ssl);
+\& int SSL_is_quic(const SSL *ssl);
 \&
 \& int SSL_version(const SSL *s);
 .Ve
 .SH DESCRIPTION
 .IX Header "DESCRIPTION"
-\&\fBSSL_client_version()\fR returns the numeric protocol version advertised by the
-client in the legacy_version field of the ClientHello when initiating the
-connection. Note that, for TLS, this value will never indicate a version greater
-than TLSv1.2 even if TLSv1.3 is subsequently negotiated. \fBSSL_get_version()\fR
-returns the name of the protocol used for the connection. \fBSSL_version()\fR returns
-the numeric protocol version used for the connection. They should only be called
-after the initial handshake has been completed. Prior to that the results
-returned from these functions may be unreliable.
+For SSL, TLS and DTLS protocols \fBSSL_client_version()\fR returns the numeric
+protocol version advertised by the client in the legacy_version field of the
+ClientHello when initiating the connection. Note that, for TLS, this value
+will never indicate a version greater than TLSv1.2 even if TLSv1.3 is
+subsequently negotiated. For QUIC connections it returns OSSL_QUIC1_VERSION.
 .PP
-\&\fBSSL_is_dtls()\fR returns one if the connection is using DTLS, zero if not.
+\&\fBSSL_get_version()\fR returns the name of the protocol used for the connection.
+\&\fBSSL_version()\fR returns the numeric protocol version used for the connection.
+They should only be called after the initial handshake has been completed.
+Prior to that the results returned from these functions may be unreliable.
+.PP
+\&\fBSSL_is_dtls()\fR returns 1 if the connection is using DTLS or 0 if not.
+.PP
+\&\fBSSL_is_tls()\fR returns 1 if the connection is using SSL/TLS or 0 if not.
+.PP
+\&\fBSSL_is_quic()\fR returns 1 if the connection is using QUIC or 0 if not.
 .SH "RETURN VALUES"
 .IX Header "RETURN VALUES"
 \&\fBSSL_get_version()\fR returns one of the following strings:
@@ -106,6 +114,18 @@ The connection uses the TLSv1.2 protocol.
 .IP TLSv1.3 4
 .IX Item "TLSv1.3"
 The connection uses the TLSv1.3 protocol.
+.IP DTLSv0.9 4
+.IX Item "DTLSv0.9"
+The connection uses an obsolete pre-standardisation DTLS protocol
+.IP DTLSv1 4
+.IX Item "DTLSv1"
+The connection uses the DTLSv1 protocol
+.IP DTLSv1.2 4
+.IX Item "DTLSv1.2"
+The connection uses the DTLSv1.2 protocol
+.IP QUICv1 4
+.IX Item "QUICv1"
+The connection uses the QUICv1 protocol.
 .IP unknown 4
 .IX Item "unknown"
 This indicates an unknown protocol version.
@@ -128,15 +148,28 @@ The connection uses the TLSv1.2 protocol.
 .IX Item "TLS1_3_VERSION"
 The connection uses the TLSv1.3 protocol (never returned for
 \&\fBSSL_client_version()\fR).
+.IP DTLS1_BAD_VER 4
+.IX Item "DTLS1_BAD_VER"
+The connection uses an obsolete pre-standardisation DTLS protocol
+.IP DTLS1_VERSION 4
+.IX Item "DTLS1_VERSION"
+The connection uses the DTLSv1 protocol
+.IP DTLS1_2_VERSION 4
+.IX Item "DTLS1_2_VERSION"
+The connection uses the DTLSv1.2 protocol
+.IP OSSL_QUIC1_VERSION 4
+.IX Item "OSSL_QUIC1_VERSION"
+The connection uses the QUICv1 protocol.
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
 \&\fBssl\fR\|(7)
 .SH HISTORY
 .IX Header "HISTORY"
-The \fBSSL_is_dtls()\fR function was added in OpenSSL 1.1.0.
+The \fBSSL_is_dtls()\fR function was added in OpenSSL 1.1.0. The \fBSSL_is_tls()\fR and
+\&\fBSSL_is_quic()\fR functions were added in OpenSSL 3.2.
 .SH COPYRIGHT
 .IX Header "COPYRIGHT"
-Copyright 2001\-2018 The OpenSSL Project Authors. All Rights Reserved.
+Copyright 2001\-2023 The OpenSSL Project Authors. All Rights Reserved.
 .PP
 Licensed under the Apache License 2.0 (the "License").  You may not use
 this file except in compliance with the License.  You can obtain a copy