summaryrefslogtreecommitdiff
path: root/src/lib/libssl/man/ssl.3
diff options
context:
space:
mode:
authorschwarze <>2018-03-17 18:19:49 +0000
committerschwarze <>2018-03-17 18:19:49 +0000
commit6f8df959b6c5413c67db6629ba3ad7806ac55138 (patch)
treebd477a25cfb7c3f7ad14f34a8ce304c0d9d848bb /src/lib/libssl/man/ssl.3
parent051e2e3f93898417f4dc8399f8a9d879c26209a4 (diff)
downloadopenbsd-6f8df959b6c5413c67db6629ba3ad7806ac55138.tar.gz
openbsd-6f8df959b6c5413c67db6629ba3ad7806ac55138.tar.bz2
openbsd-6f8df959b6c5413c67db6629ba3ad7806ac55138.zip
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.
Diffstat (limited to 'src/lib/libssl/man/ssl.3')
-rw-r--r--src/lib/libssl/man/ssl.35
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/libssl/man/ssl.3 b/src/lib/libssl/man/ssl.3
index 977e6075b2..23f2f21b54 100644
--- a/src/lib/libssl/man/ssl.3
+++ b/src/lib/libssl/man/ssl.3
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssl.3,v 1.13 2018/02/27 19:14:49 schwarze Exp $ 1.\" $OpenBSD: ssl.3,v 1.14 2018/03/17 18:19:49 schwarze Exp $
2.\" full merge up to: OpenSSL e330f55d Nov 11 00:51:04 2016 +0100 2.\" full merge up to: OpenSSL e330f55d Nov 11 00:51:04 2016 +0100
3.\" selective merge up to: OpenSSL cbade361 Dec 12 13:14:45 2017 +0100 3.\" selective merge up to: OpenSSL cbade361 Dec 12 13:14:45 2017 +0100
4.\" 4.\"
@@ -51,7 +51,7 @@
51.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 51.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
52.\" OF THE POSSIBILITY OF SUCH DAMAGE. 52.\" OF THE POSSIBILITY OF SUCH DAMAGE.
53.\" 53.\"
54.Dd $Mdocdate: February 27 2018 $ 54.Dd $Mdocdate: March 17 2018 $
55.Dt SSL 3 55.Dt SSL 3
56.Os 56.Os
57.Sh NAME 57.Sh NAME
@@ -249,6 +249,7 @@ Accessors:
249.Xr SSL_SESSION_get_protocol_version 3 , 249.Xr SSL_SESSION_get_protocol_version 3 ,
250.Xr SSL_SESSION_get_time 3 , 250.Xr SSL_SESSION_get_time 3 ,
251.Xr SSL_SESSION_get0_peer 3 , 251.Xr SSL_SESSION_get0_peer 3 ,
252.Xr SSL_SESSION_has_ticket 3 ,
252.Xr SSL_SESSION_set1_id_context 3 253.Xr SSL_SESSION_set1_id_context 3
253.Pp 254.Pp
254Encoding and decoding: 255Encoding and decoding: