From a1e5cce119a606b4893b669fb07740ff6b2d004e Mon Sep 17 00:00:00 2001 From: schwarze Date: Mon, 10 Apr 2017 15:37:55 +0000 Subject: [PATCH] Additional SSL_SESSION documentation from Matt Caswell , OpenSSL commit b31db505. Improve crosslinking while here. --- lib/libssl/man/Makefile | 6 +- .../man/SSL_CTX_set_session_id_context.3 | 7 +- lib/libssl/man/SSL_SESSION_get0_peer.3 | 76 +++++++++++++++++ lib/libssl/man/SSL_SESSION_get_compress_id.3 | 72 ++++++++++++++++ lib/libssl/man/SSL_SESSION_get_id.3 | 76 +++++++++++++++++ lib/libssl/man/SSL_SESSION_get_time.3 | 8 +- lib/libssl/man/SSL_SESSION_new.3 | 11 ++- lib/libssl/man/SSL_SESSION_set1_id_context.3 | 83 +++++++++++++++++++ lib/libssl/man/SSL_copy_session_id.3 | 6 +- lib/libssl/man/SSL_get_session.3 | 12 ++- lib/libssl/man/ssl.3 | 8 +- 11 files changed, 349 insertions(+), 16 deletions(-) create mode 100644 lib/libssl/man/SSL_SESSION_get0_peer.3 create mode 100644 lib/libssl/man/SSL_SESSION_get_compress_id.3 create mode 100644 lib/libssl/man/SSL_SESSION_get_id.3 create mode 100644 lib/libssl/man/SSL_SESSION_set1_id_context.3 diff --git a/lib/libssl/man/Makefile b/lib/libssl/man/Makefile index f57c638a179..e7c8af78722 100644 --- a/lib/libssl/man/Makefile +++ b/lib/libssl/man/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.53 2017/04/10 13:05:06 schwarze Exp $ +# $OpenBSD: Makefile,v 1.54 2017/04/10 15:37:55 schwarze Exp $ .include @@ -47,10 +47,14 @@ MAN = BIO_f_ssl.3 \ SSL_CTX_set_verify.3 \ SSL_CTX_use_certificate.3 \ SSL_SESSION_free.3 \ + SSL_SESSION_get_compress_id.3 \ SSL_SESSION_get_ex_new_index.3 \ + SSL_SESSION_get_id.3 \ SSL_SESSION_get_time.3 \ + SSL_SESSION_get0_peer.3 \ SSL_SESSION_new.3 \ SSL_SESSION_print.3 \ + SSL_SESSION_set1_id_context.3 \ SSL_accept.3 \ SSL_alert_type_string.3 \ SSL_clear.3 \ diff --git a/lib/libssl/man/SSL_CTX_set_session_id_context.3 b/lib/libssl/man/SSL_CTX_set_session_id_context.3 index 654d638a013..99fa4ae8e39 100644 --- a/lib/libssl/man/SSL_CTX_set_session_id_context.3 +++ b/lib/libssl/man/SSL_CTX_set_session_id_context.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: SSL_CTX_set_session_id_context.3,v 1.2 2016/12/01 19:50:12 schwarze Exp $ +.\" $OpenBSD: SSL_CTX_set_session_id_context.3,v 1.3 2017/04/10 15:37:55 schwarze Exp $ .\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 .\" .\" This file was written by Lutz Jaenicke . @@ -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: December 1 2016 $ +.Dd $Mdocdate: April 10 2017 $ .Dt SSL_CTX_SET_SESSION_ID_CONTEXT 3 .Os .Sh NAME @@ -149,4 +149,5 @@ The error is logged to the error stack. The operation succeeded. .El .Sh SEE ALSO -.Xr ssl 3 +.Xr ssl 3 , +.Xr SSL_SESSION_set1_id_context 3 diff --git a/lib/libssl/man/SSL_SESSION_get0_peer.3 b/lib/libssl/man/SSL_SESSION_get0_peer.3 new file mode 100644 index 00000000000..2c5e6ce7e81 --- /dev/null +++ b/lib/libssl/man/SSL_SESSION_get0_peer.3 @@ -0,0 +1,76 @@ +.\" $OpenBSD: SSL_SESSION_get0_peer.3,v 1.1 2017/04/10 15:37:55 schwarze Exp $ +.\" OpenSSL SSL_SESSION_get0_peer.pod b31db505 Mar 24 16:01:50 2017 +0000 +.\" +.\" This file was written by Matt Caswell +.\" Copyright (c) 2017 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: April 10 2017 $ +.Dt SSL_SESSION_GET0_PEER 3 +.Os +.Sh NAME +.Nm SSL_SESSION_get0_peer +.Nd get details about peer's certificate for a session +.Sh SYNOPSIS +.In openssl/ssl.h +.Ft X509 * +.Fo SSL_SESSION_get0_peer +.Fa "SSL_SESSION *s" +.Fc +.Sh DESCRIPTION +.Fn SSL_SESSION_get0_peer +returns a pointer to the peer certificate associated with the session +.Fa s +or +.Dv NULL +if no peer certificate is available. +The caller should not free the returned value, unless +.Xr X509_up_ref 3 +has also been called. +.Sh SEE ALSO +.Xr ssl 3 , +.Xr SSL_get_session 3 , +.Xr 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 new file mode 100644 index 00000000000..0287f371a81 --- /dev/null +++ b/lib/libssl/man/SSL_SESSION_get_compress_id.3 @@ -0,0 +1,72 @@ +.\" $OpenBSD: SSL_SESSION_get_compress_id.3,v 1.1 2017/04/10 15:37:55 schwarze Exp $ +.\" OpenSSL SSL_SESSION_get_compress_id.pod b31db505 Mar 24 16:01:50 2017 +.\" +.\" This file was written by Matt Caswell +.\" Copyright (c) 2017 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: April 10 2017 $ +.Dt SSL_SESSION_GET_COMPRESS_ID 3 +.Os +.Sh NAME +.Nm SSL_SESSION_get_compress_id +.Nd get details about the compression associated with a session +.Sh SYNOPSIS +.In openssl/ssl.h +.Ft unsigned int +.Fo SSL_SESSION_get_compress_id +.Fa "const SSL_SESSION *s" +.Fc +.Sh DESCRIPTION +If compression has been negotiated for an ssl session, +.Fn SSL_SESSION_get_compress_id +returns the id for the compression method, or 0 otherwise. +The only built-in supported compression method is zlib, +which has an id of 1. +.Sh SEE ALSO +.Xr ssl 3 , +.Xr SSL_get_session 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 new file mode 100644 index 00000000000..05b1fe53d99 --- /dev/null +++ b/lib/libssl/man/SSL_SESSION_get_id.3 @@ -0,0 +1,76 @@ +.\" $OpenBSD: SSL_SESSION_get_id.3,v 1.1 2017/04/10 15:37:55 schwarze Exp $ +.\" OpenSSL SSL_SESSION_set1_id.pod b31db505 Mar 24 16:01:50 2017 +0000 +.\" +.\" This file was written by Matt Caswell +.\" Copyright (c) 2017 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: April 10 2017 $ +.Dt SSL_SESSION_GET_ID 3 +.Os +.Sh NAME +.Nm SSL_SESSION_get_id +.Nd get the SSL session ID +.Sh SYNOPSIS +.In openssl/ssl.h +.Ft const unsigned char * +.Fo SSL_SESSION_get_id +.Fa "const SSL_SESSION *s" +.Fa "unsigned int *len" +.Fc +.Sh DESCRIPTION +.Fn SSL_SESSION_get_id +returns a pointer to the internal session id value for the session +.Fa s . +The length of the id in bytes is stored in +.Pf * Fa len . +The length may be 0. +The caller should not free the returned pointer directly. +.Sh SEE ALSO +.Xr ssl 3 , +.Xr SSL_copy_session_id 3 , +.Xr SSL_get_session 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 7eef62d78b4..387a45f5e1d 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.2 2016/12/06 22:41:16 schwarze Exp $ +.\" $OpenBSD: SSL_SESSION_get_time.3,v 1.3 2017/04/10 15:37:55 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: December 6 2016 $ +.Dd $Mdocdate: April 10 2017 $ .Dt SSL_SESSION_GET_TIME 3 .Os .Sh NAME @@ -143,4 +143,6 @@ pointer for the session .Sh SEE ALSO .Xr ssl 3 , .Xr SSL_CTX_set_timeout 3 , -.Xr SSL_get_default_timeout 3 +.Xr SSL_get_default_timeout 3 , +.Xr SSL_get_session 3 , +.Xr SSL_SESSION_new 3 diff --git a/lib/libssl/man/SSL_SESSION_new.3 b/lib/libssl/man/SSL_SESSION_new.3 index 77e77e9105e..54d22b8ed51 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.1 2016/12/06 18:40:31 schwarze Exp $ +.\" $OpenBSD: SSL_SESSION_new.3,v 1.2 2017/04/10 15:37:55 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: December 6 2016 $ +.Dd $Mdocdate: April 10 2017 $ .Dt SSL_SESSION_NEW 3 .Os .Sh NAME @@ -54,9 +54,16 @@ returns .Xr d2i_SSL_SESSION 3 , .Xr PEM_read_SSL_SESSION 3 , .Xr SSL_connect 3 , +.Xr SSL_copy_session_id 3 , .Xr SSL_CTX_add_session 3 , +.Xr SSL_CTX_sess_set_get_cb 3 , .Xr SSL_get_session 3 , .Xr SSL_SESSION_free 3 , +.Xr SSL_SESSION_get0_peer 3 , +.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_time 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_SESSION_set1_id_context.3 b/lib/libssl/man/SSL_SESSION_set1_id_context.3 new file mode 100644 index 00000000000..f7fa13ebcfe --- /dev/null +++ b/lib/libssl/man/SSL_SESSION_set1_id_context.3 @@ -0,0 +1,83 @@ +.\" $OpenBSD: SSL_SESSION_set1_id_context.3,v 1.1 2017/04/10 15:37:55 schwarze Exp $ +.\" OpenSSL SSL_SESSION_get0_id_context.pod b31db505 Mar 24 16:01:50 2017 +.\" +.\" This file was written by Matt Caswell +.\" Copyright (c) 2017 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: April 10 2017 $ +.Dt SSL_SESSION_SET1_ID_CONTEXT 3 +.Os +.Sh NAME +.Nm SSL_SESSION_set1_id_context +.Nd set the SSL ID context associated with a session +.Sh SYNOPSIS +.In openssl/ssl.h +.Ft int +.Fo SSL_SESSION_set1_id_context +.Fa "SSL_SESSION *s" +.Fa "const unsigned char *sid_ctx" +.Fa "unsigned int sid_ctx_len" +.Fc +.Sh DESCRIPTION +.Fn SSL_SESSION_set1_id_context +takes a copy of the provided ID context given in +.Fa sid_ctx +and associates it with the session +.Fa s . +The length of the ID context is given by +.Fa sid_ctx_len +which must not exceed +.Dv SSL_MAX_SID_CTX_LENGTH +bytes. +.Sh RETURN VALUES +.Fn SSL_SESSION_set1_id_context +returns 1 on success or 0 on error. +.Sh SEE ALSO +.Xr ssl 3 , +.Xr SSL_CTX_set_session_id_context 3 , +.Xr SSL_get_session 3 , +.Xr SSL_SESSION_new 3 diff --git a/lib/libssl/man/SSL_copy_session_id.3 b/lib/libssl/man/SSL_copy_session_id.3 index 2f96ecffd7c..52a5aea314a 100644 --- a/lib/libssl/man/SSL_copy_session_id.3 +++ b/lib/libssl/man/SSL_copy_session_id.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: SSL_copy_session_id.3,v 1.1 2016/12/07 18:09:31 schwarze Exp $ +.\" $OpenBSD: SSL_copy_session_id.3,v 1.2 2017/04/10 15:37:55 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: December 7 2016 $ +.Dd $Mdocdate: April 10 2017 $ .Dt SSL_COPY_SESSION_ID 3 .Os .Sh NAME @@ -59,6 +59,8 @@ and by .Xr BIO_ssl_copy_session_id 3 , .Xr SSL_dup 3 , .Xr SSL_get_session 3 , +.Xr SSL_SESSION_get_id 3 , +.Xr SSL_SESSION_new 3 , .Xr SSL_set_session 3 , .Xr SSL_set_session_id_context 3 .Sh HISTORY diff --git a/lib/libssl/man/SSL_get_session.3 b/lib/libssl/man/SSL_get_session.3 index 2591fce7276..8a1efa674d8 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.2 2016/12/03 09:13:56 schwarze Exp $ +.\" $OpenBSD: SSL_get_session.3,v 1.3 2017/04/10 15:37:55 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: December 3 2016 $ +.Dd $Mdocdate: April 10 2017 $ .Dt SSL_GET_SESSION 3 .Os .Sh NAME @@ -142,4 +142,10 @@ session. .Xr ssl 3 , .Xr SSL_clear 3 , .Xr SSL_free 3 , -.Xr SSL_SESSION_free 3 +.Xr SSL_SESSION_free 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 , +.Xr SSL_SESSION_print 3 diff --git a/lib/libssl/man/ssl.3 b/lib/libssl/man/ssl.3 index 25834c37a88..dd3a3451e15 100644 --- a/lib/libssl/man/ssl.3 +++ b/lib/libssl/man/ssl.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssl.3,v 1.6 2017/04/10 14:00:51 schwarze Exp $ +.\" $OpenBSD: ssl.3,v 1.7 2017/04/10 15:37:55 schwarze Exp $ .\" OpenSSL e330f55d Nov 11 00:51:04 2016 +0100 .\" .\" This file was written by Ralf S. Engelschall , @@ -238,8 +238,12 @@ Constructors and destructors: .Xr SSL_SESSION_free 3 .Pp Accessors: +.Xr SSL_SESSION_get_compress_id 3 , .Xr SSL_SESSION_get_ex_new_index 3 , -.Xr SSL_SESSION_get_time 3 +.Xr SSL_SESSION_get_id 3 , +.Xr SSL_SESSION_get_time 3 , +.Xr SSL_SESSION_get0_peer 3 , +.Xr SSL_SESSION_set1_id_context 3 .Pp Encoding and decoding: .Xr d2i_SSL_SESSION 3 , -- 2.20.1