From 81636af24115c47360868ec28d52068877500921 Mon Sep 17 00:00:00 2001 From: schwarze Date: Sat, 24 Feb 2018 19:24:09 +0000 Subject: [PATCH] In ssl.h rev. 1.141 2018/02/20 18:07:11, tb@ provided SSL_SESSION_get_protocol_version(3). Import the documentation form OpenSSL, tweaked by me, OK tb@. --- lib/libssl/man/Makefile | 3 +- lib/libssl/man/SSL_SESSION_get_compress_id.3 | 6 +- lib/libssl/man/SSL_SESSION_get_id.3 | 6 +- .../man/SSL_SESSION_get_protocol_version.3 | 83 +++++++++++++++++++ lib/libssl/man/SSL_SESSION_new.3 | 6 +- lib/libssl/man/SSL_get_session.3 | 8 +- lib/libssl/man/ssl.3 | 6 +- 7 files changed, 106 insertions(+), 12 deletions(-) create mode 100644 lib/libssl/man/SSL_SESSION_get_protocol_version.3 diff --git a/lib/libssl/man/Makefile b/lib/libssl/man/Makefile index 413d77c0a77..9679441fc4a 100644 --- a/lib/libssl/man/Makefile +++ b/lib/libssl/man/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.61 2018/02/18 23:34:01 schwarze Exp $ +# $OpenBSD: Makefile,v 1.62 2018/02/24 19:24:09 schwarze Exp $ .include @@ -53,6 +53,7 @@ MAN = BIO_f_ssl.3 \ SSL_SESSION_get_compress_id.3 \ SSL_SESSION_get_ex_new_index.3 \ SSL_SESSION_get_id.3 \ + SSL_SESSION_get_protocol_version.3 \ SSL_SESSION_get_time.3 \ SSL_SESSION_get0_peer.3 \ SSL_SESSION_new.3 \ diff --git a/lib/libssl/man/SSL_SESSION_get_compress_id.3 b/lib/libssl/man/SSL_SESSION_get_compress_id.3 index 0287f371a81..7d284002a31 100644 --- a/lib/libssl/man/SSL_SESSION_get_compress_id.3 +++ b/lib/libssl/man/SSL_SESSION_get_compress_id.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: SSL_SESSION_get_compress_id.3,v 1.1 2017/04/10 15:37:55 schwarze Exp $ +.\" $OpenBSD: SSL_SESSION_get_compress_id.3,v 1.2 2018/02/24 19:24:09 schwarze Exp $ .\" OpenSSL SSL_SESSION_get_compress_id.pod b31db505 Mar 24 16:01:50 2017 .\" .\" This file was written by Matt Caswell @@ -48,7 +48,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: April 10 2017 $ +.Dd $Mdocdate: February 24 2018 $ .Dt SSL_SESSION_GET_COMPRESS_ID 3 .Os .Sh NAME @@ -69,4 +69,6 @@ which has an id of 1. .Sh SEE ALSO .Xr ssl 3 , .Xr SSL_get_session 3 , +.Xr SSL_SESSION_get_id 3 , +.Xr SSL_SESSION_get_protocol_version 3 , .Xr SSL_SESSION_new 3 diff --git a/lib/libssl/man/SSL_SESSION_get_id.3 b/lib/libssl/man/SSL_SESSION_get_id.3 index 05b1fe53d99..41d999864fe 100644 --- a/lib/libssl/man/SSL_SESSION_get_id.3 +++ b/lib/libssl/man/SSL_SESSION_get_id.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: SSL_SESSION_get_id.3,v 1.1 2017/04/10 15:37:55 schwarze Exp $ +.\" $OpenBSD: SSL_SESSION_get_id.3,v 1.2 2018/02/24 19:24:09 schwarze Exp $ .\" OpenSSL SSL_SESSION_set1_id.pod b31db505 Mar 24 16:01:50 2017 +0000 .\" .\" This file was written by Matt Caswell @@ -48,7 +48,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: April 10 2017 $ +.Dd $Mdocdate: February 24 2018 $ .Dt SSL_SESSION_GET_ID 3 .Os .Sh NAME @@ -73,4 +73,6 @@ The caller should not free the returned pointer directly. .Xr ssl 3 , .Xr SSL_copy_session_id 3 , .Xr SSL_get_session 3 , +.Xr SSL_SESSION_get_compress_id 3 , +.Xr SSL_SESSION_get_protocol_version 3 , .Xr SSL_SESSION_new 3 diff --git a/lib/libssl/man/SSL_SESSION_get_protocol_version.3 b/lib/libssl/man/SSL_SESSION_get_protocol_version.3 new file mode 100644 index 00000000000..8c03d6c6292 --- /dev/null +++ b/lib/libssl/man/SSL_SESSION_get_protocol_version.3 @@ -0,0 +1,83 @@ +.\" $OpenBSD: SSL_SESSION_get_protocol_version.3,v 1.1 2018/02/24 19:24:09 schwarze Exp $ +.\" full merge up to: OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 +.\" +.\" This file was written by TJ Saunders +.\" Copyright (c) 2016 The OpenSSL Project. All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in +.\" the documentation and/or other materials provided with the +.\" distribution. +.\" +.\" 3. All advertising materials mentioning features or use of this +.\" software must display the following acknowledgment: +.\" "This product includes software developed by the OpenSSL Project +.\" for use in the OpenSSL Toolkit. (http://www.openssl.org/)" +.\" +.\" 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to +.\" endorse or promote products derived from this software without +.\" prior written permission. For written permission, please contact +.\" openssl-core@openssl.org. +.\" +.\" 5. Products derived from this software may not be called "OpenSSL" +.\" nor may "OpenSSL" appear in their names without prior written +.\" permission of the OpenSSL Project. +.\" +.\" 6. Redistributions of any form whatsoever must retain the following +.\" acknowledgment: +.\" "This product includes software developed by the OpenSSL Project +.\" for use in the OpenSSL Toolkit (http://www.openssl.org/)" +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY +.\" EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR +.\" ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +.\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED +.\" OF THE POSSIBILITY OF SUCH DAMAGE. +.\" +.Dd $Mdocdate: February 24 2018 $ +.Dt SSL_SESSION_GET_PROTOCOL_VERSION 3 +.Os +.Sh NAME +.Nm SSL_SESSION_get_protocol_version +.Nd get the session protocol version +.Sh SYNOPSIS +.In openssl/ssl.h +.Ft int +.Fo SSL_SESSION_get_protocol_version +.Fa "const SSL_SESSION *s" +.Fc +.Sh DESCRIPTION +.Fn SSL_SESSION_get_protocol_version +returns the protocol version number used by the session +.Fa s . +.Sh RETURN VALUES +.Fn SSL_SESSION_get_protocol_version +returns a constant like +.Dv TLS1_VERSION +or +.Dv TLS1_2_VERSION . +.Sh SEE ALSO +.Xr ssl 3 , +.Xr SSL_get_session 3 , +.Xr SSL_SESSION_get0_peer 3 , +.Xr SSL_SESSION_get_compress_id 3 , +.Xr SSL_SESSION_get_id 3 , +.Xr SSL_SESSION_get_time 3 , +.Xr SSL_SESSION_new 3 +.Sh HISTORY +.Fn SSL_SESSION_get_protocol_version +first appeared in OpenSSL 1.1.0. diff --git a/lib/libssl/man/SSL_SESSION_new.3 b/lib/libssl/man/SSL_SESSION_new.3 index 54d22b8ed51..52d59fd7b6c 100644 --- a/lib/libssl/man/SSL_SESSION_new.3 +++ b/lib/libssl/man/SSL_SESSION_new.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: SSL_SESSION_new.3,v 1.2 2017/04/10 15:37:55 schwarze Exp $ +.\" $OpenBSD: SSL_SESSION_new.3,v 1.3 2018/02/24 19:24:09 schwarze Exp $ .\" .\" Copyright (c) 2016 Ingo Schwarze .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: April 10 2017 $ +.Dd $Mdocdate: February 24 2018 $ .Dt SSL_SESSION_NEW 3 .Os .Sh NAME @@ -63,6 +63,8 @@ returns .Xr SSL_SESSION_get_compress_id 3 , .Xr SSL_SESSION_get_ex_new_index 3 , .Xr SSL_SESSION_get_id 3 , +.Xr SSL_SESSION_get_master_key 3 , +.Xr SSL_SESSION_get_protocol_version 3 , .Xr SSL_SESSION_get_time 3 , .Xr SSL_SESSION_print 3 , .Xr SSL_SESSION_set1_id_context 3 , diff --git a/lib/libssl/man/SSL_get_session.3 b/lib/libssl/man/SSL_get_session.3 index 8a1efa674d8..9963a7a6a87 100644 --- a/lib/libssl/man/SSL_get_session.3 +++ b/lib/libssl/man/SSL_get_session.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: SSL_get_session.3,v 1.3 2017/04/10 15:37:55 schwarze Exp $ +.\" $OpenBSD: SSL_get_session.3,v 1.4 2018/02/24 19:24:09 schwarze Exp $ .\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 .\" .\" This file was written by Lutz Jaenicke . @@ -49,7 +49,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: April 10 2017 $ +.Dd $Mdocdate: February 24 2018 $ .Dt SSL_GET_SESSION 3 .Os .Sh NAME @@ -146,6 +146,8 @@ session. .Xr SSL_SESSION_get0_peer 3 , .Xr SSL_SESSION_get_compress_id 3 , .Xr SSL_SESSION_get_id 3 , +.Xr SSL_SESSION_get_protocol_version 3 , .Xr SSL_SESSION_get_time 3 , .Xr SSL_SESSION_new 3 , -.Xr SSL_SESSION_print 3 +.Xr SSL_SESSION_print 3 , +.Xr SSL_set_session 3 diff --git a/lib/libssl/man/ssl.3 b/lib/libssl/man/ssl.3 index 9f3f121b328..bb032570642 100644 --- a/lib/libssl/man/ssl.3 +++ b/lib/libssl/man/ssl.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssl.3,v 1.11 2017/08/21 10:10:25 schwarze Exp $ +.\" $OpenBSD: ssl.3,v 1.12 2018/02/24 19:24:09 schwarze Exp $ .\" OpenSSL e330f55d Nov 11 00:51:04 2016 +0100 .\" .\" This file was written by Ralf S. Engelschall , @@ -50,7 +50,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: August 21 2017 $ +.Dd $Mdocdate: February 24 2018 $ .Dt SSL 3 .Os .Sh NAME @@ -245,6 +245,7 @@ Accessors: .Xr SSL_SESSION_get_compress_id 3 , .Xr SSL_SESSION_get_ex_new_index 3 , .Xr SSL_SESSION_get_id 3 , +.Xr SSL_SESSION_get_protocol_version 3 , .Xr SSL_SESSION_get_time 3 , .Xr SSL_SESSION_get0_peer 3 , .Xr SSL_SESSION_set1_id_context 3 @@ -288,6 +289,7 @@ Accessors: .Xr SSL_export_keying_material 3 , .Xr SSL_get_SSL_CTX 3 , .Xr SSL_get_certificate 3 , +.Xr SSL_get_client_random 3 , .Xr SSL_get_default_timeout 3 , .Xr SSL_get_error 3 , .Xr SSL_get_ex_data_X509_STORE_CTX_idx 3 , -- 2.20.1