In ssl.h rev. 1.152 2018/03/17 15:55:52, tb@ provided

SSL_SESSION_has_ticket(3) and SSL_SESSION_get_ticket_lifetime_hint(3).
Merge the documentation from OpenSSL, tweaked by me.

6 files changed, 97 insertions, 9 deletions

diff --git a/lib/libssl/man/Makefile b/lib/libssl/man/Makefile
index 2d32f44dbff..d5141811e78 100644
--- a/lib/libssl/man/Makefile
+++ b/lib/libssl/man/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.63 2018/02/27 18:30:30 schwarze Exp $
+# $OpenBSD: Makefile,v 1.64 2018/03/17 18:19:49 schwarze Exp $
 
 .include <bsd.own.mk>
 
@@ -57,6 +57,7 @@ MAN =	BIO_f_ssl.3 \
 	SSL_SESSION_get_protocol_version.3 \
 	SSL_SESSION_get_time.3 \
 	SSL_SESSION_get0_peer.3 \
+	SSL_SESSION_has_ticket.3 \
 	SSL_SESSION_new.3 \
 	SSL_SESSION_print.3 \
 	SSL_SESSION_set1_id_context.3 \
diff --git a/lib/libssl/man/SSL_SESSION_get_id.3 b/lib/libssl/man/SSL_SESSION_get_id.3
index 41d999864fe..795effb9482 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.2 2018/02/24 19:24:09 schwarze Exp $
+.\"	$OpenBSD: SSL_SESSION_get_id.3,v 1.3 2018/03/17 18:19:49 schwarze Exp $
 .\"	OpenSSL SSL_SESSION_set1_id.pod b31db505 Mar 24 16:01:50 2017 +0000
 .\"
 .\" This file was written by Matt Caswell <matt@openssl.org>
@@ -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: February 24 2018 $
+.Dd $Mdocdate: March 17 2018 $
 .Dt SSL_SESSION_GET_ID 3
 .Os
 .Sh NAME
@@ -75,4 +75,5 @@ The caller should not free the returned pointer directly.
 .Xr SSL_get_session 3 ,
 .Xr SSL_SESSION_get_compress_id 3 ,
 .Xr SSL_SESSION_get_protocol_version 3 ,
+.Xr SSL_SESSION_has_ticket 3 ,
 .Xr SSL_SESSION_new 3
diff --git a/lib/libssl/man/SSL_SESSION_get_time.3 b/lib/libssl/man/SSL_SESSION_get_time.3
index 387a45f5e1d..71ebb6f3d3c 100644
--- a/lib/libssl/man/SSL_SESSION_get_time.3
+++ b/lib/libssl/man/SSL_SESSION_get_time.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: SSL_SESSION_get_time.3,v 1.3 2017/04/10 15:37:55 schwarze Exp $
+.\"	$OpenBSD: SSL_SESSION_get_time.3,v 1.4 2018/03/17 18:19:49 schwarze Exp $
 .\"	OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100
 .\"
 .\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>.
@@ -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: March 17 2018 $
 .Dt SSL_SESSION_GET_TIME 3
 .Os
 .Sh NAME
@@ -145,4 +145,5 @@ pointer for the session
 .Xr SSL_CTX_set_timeout 3 ,
 .Xr SSL_get_default_timeout 3 ,
 .Xr SSL_get_session 3 ,
+.Xr SSL_SESSION_has_ticket 3 ,
 .Xr SSL_SESSION_new 3
diff --git a/lib/libssl/man/SSL_SESSION_has_ticket.3 b/lib/libssl/man/SSL_SESSION_has_ticket.3
new file mode 100644
index 00000000000..c70be41e18e
--- /dev/null
+++ b/lib/libssl/man/SSL_SESSION_has_ticket.3
@@ -0,0 +1,83 @@
+.\" $OpenBSD: SSL_SESSION_has_ticket.3,v 1.1 2018/03/17 18:19:49 schwarze Exp $
+.\" full merge up to: OpenSSL f2baac27 Feb 8 15:43:16 2015 +0000
+.\" selective merge up to: OpenSSL 61f805c1 Jan 16 01:01:46 2018 +0800
+.\"
+.\" This file was written by Matt Caswell <matt@openssl.org>.
+.\" Copyright (c) 2015 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: March 17 2018 $
+.Dt SSL_SESSION_HAS_TICKET 3
+.Os
+.Sh NAME
+.Nm SSL_SESSION_has_ticket ,
+.Nm SSL_SESSION_get_ticket_lifetime_hint
+.Nd get details about the ticket associated with a session
+.Sh SYNOPSIS
+.In openssl/ssl.h
+.Ft int
+.Fo SSL_SESSION_has_ticket
+.Fa "const SSL_SESSION *s"
+.Fc
+.Ft unsigned long
+.Fo SSL_SESSION_get_ticket_lifetime_hint
+.Fa "const SSL_SESSION *s"
+.Fc
+.Sh DESCRIPTION
+.Fn SSL_SESSION_has_ticket
+returns 1 if there is a Session Ticket associated with
+.Fa s
+or 0 otherwise.
+.Pp
+.Fn SSL_SESSION_get_ticket_lifetime_hint
+returns the lifetime hint in seconds associated with the session ticket.
+.Sh SEE ALSO
+.Xr ssl 3 ,
+.Xr SSL_SESSION_get_id 3 ,
+.Xr SSL_SESSION_get_time 3 ,
+.Xr SSL_SESSION_new 3
+.Sh HISTORY
+These functions 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 52d59fd7b6c..ea77f69435c 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.3 2018/02/24 19:24:09 schwarze Exp $
+.\"	$OpenBSD: SSL_SESSION_new.3,v 1.4 2018/03/17 18:19:49 schwarze Exp $
 .\"
 .\" Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
 .\"
@@ -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: February 24 2018 $
+.Dd $Mdocdate: March 17 2018 $
 .Dt SSL_SESSION_NEW 3
 .Os
 .Sh NAME
@@ -66,6 +66,7 @@ returns
 .Xr SSL_SESSION_get_master_key 3 ,
 .Xr SSL_SESSION_get_protocol_version 3 ,
 .Xr SSL_SESSION_get_time 3 ,
+.Xr SSL_SESSION_has_ticket 3 ,
 .Xr SSL_SESSION_print 3 ,
 .Xr SSL_SESSION_set1_id_context 3 ,
 .Xr SSL_set_session 3
diff --git a/lib/libssl/man/ssl.3 b/lib/libssl/man/ssl.3
index 977e6075b2e..23f2f21b545 100644
--- a/lib/libssl/man/ssl.3
+++ b/lib/libssl/man/ssl.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ssl.3,v 1.13 2018/02/27 19:14:49 schwarze Exp $
+.\" $OpenBSD: ssl.3,v 1.14 2018/03/17 18:19:49 schwarze Exp $
 .\" full merge up to: OpenSSL e330f55d Nov 11 00:51:04 2016 +0100
 .\" selective merge up to: OpenSSL cbade361 Dec 12 13:14:45 2017 +0100
 .\"
@@ -51,7 +51,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: February 27 2018 $
+.Dd $Mdocdate: March 17 2018 $
 .Dt SSL 3
 .Os
 .Sh NAME
@@ -249,6 +249,7 @@ Accessors:
 .Xr SSL_SESSION_get_protocol_version 3 ,
 .Xr SSL_SESSION_get_time 3 ,
 .Xr SSL_SESSION_get0_peer 3 ,
+.Xr SSL_SESSION_has_ticket 3 ,
 .Xr SSL_SESSION_set1_id_context 3
 .Pp
 Encoding and decoding: