diff options
author | schwarze <> | 2017-04-10 15:37:55 +0000 |
---|---|---|
committer | schwarze <> | 2017-04-10 15:37:55 +0000 |
commit | 311ed046b5f6bafabbb9b5de9b24e9da8c6d2b01 (patch) | |
tree | 12bab581c4fb54666988c9af7ab0cd5afe5b91fa | |
parent | 8a5748de22641b532d821bcbbdbcdfc37a4fdab2 (diff) | |
download | openbsd-311ed046b5f6bafabbb9b5de9b24e9da8c6d2b01.tar.gz openbsd-311ed046b5f6bafabbb9b5de9b24e9da8c6d2b01.tar.bz2 openbsd-311ed046b5f6bafabbb9b5de9b24e9da8c6d2b01.zip |
Additional SSL_SESSION documentation
from Matt Caswell <matt at openssl dot org>, OpenSSL commit b31db505.
Improve crosslinking while here.
-rw-r--r-- | src/lib/libssl/man/Makefile | 6 | ||||
-rw-r--r-- | src/lib/libssl/man/SSL_CTX_set_session_id_context.3 | 7 | ||||
-rw-r--r-- | src/lib/libssl/man/SSL_SESSION_get0_peer.3 | 76 | ||||
-rw-r--r-- | src/lib/libssl/man/SSL_SESSION_get_compress_id.3 | 72 | ||||
-rw-r--r-- | src/lib/libssl/man/SSL_SESSION_get_id.3 | 76 | ||||
-rw-r--r-- | src/lib/libssl/man/SSL_SESSION_get_time.3 | 8 | ||||
-rw-r--r-- | src/lib/libssl/man/SSL_SESSION_new.3 | 11 | ||||
-rw-r--r-- | src/lib/libssl/man/SSL_SESSION_set1_id_context.3 | 83 | ||||
-rw-r--r-- | src/lib/libssl/man/SSL_copy_session_id.3 | 6 | ||||
-rw-r--r-- | src/lib/libssl/man/SSL_get_session.3 | 12 | ||||
-rw-r--r-- | src/lib/libssl/man/ssl.3 | 8 |
11 files changed, 349 insertions, 16 deletions
diff --git a/src/lib/libssl/man/Makefile b/src/lib/libssl/man/Makefile index f57c638a17..e7c8af7872 100644 --- a/src/lib/libssl/man/Makefile +++ b/src/lib/libssl/man/Makefile | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: Makefile,v 1.53 2017/04/10 13:05:06 schwarze Exp $ | 1 | # $OpenBSD: Makefile,v 1.54 2017/04/10 15:37:55 schwarze Exp $ |
2 | 2 | ||
3 | .include <bsd.own.mk> | 3 | .include <bsd.own.mk> |
4 | 4 | ||
@@ -47,10 +47,14 @@ MAN = BIO_f_ssl.3 \ | |||
47 | SSL_CTX_set_verify.3 \ | 47 | SSL_CTX_set_verify.3 \ |
48 | SSL_CTX_use_certificate.3 \ | 48 | SSL_CTX_use_certificate.3 \ |
49 | SSL_SESSION_free.3 \ | 49 | SSL_SESSION_free.3 \ |
50 | SSL_SESSION_get_compress_id.3 \ | ||
50 | SSL_SESSION_get_ex_new_index.3 \ | 51 | SSL_SESSION_get_ex_new_index.3 \ |
52 | SSL_SESSION_get_id.3 \ | ||
51 | SSL_SESSION_get_time.3 \ | 53 | SSL_SESSION_get_time.3 \ |
54 | SSL_SESSION_get0_peer.3 \ | ||
52 | SSL_SESSION_new.3 \ | 55 | SSL_SESSION_new.3 \ |
53 | SSL_SESSION_print.3 \ | 56 | SSL_SESSION_print.3 \ |
57 | SSL_SESSION_set1_id_context.3 \ | ||
54 | SSL_accept.3 \ | 58 | SSL_accept.3 \ |
55 | SSL_alert_type_string.3 \ | 59 | SSL_alert_type_string.3 \ |
56 | SSL_clear.3 \ | 60 | SSL_clear.3 \ |
diff --git a/src/lib/libssl/man/SSL_CTX_set_session_id_context.3 b/src/lib/libssl/man/SSL_CTX_set_session_id_context.3 index 654d638a01..99fa4ae8e3 100644 --- a/src/lib/libssl/man/SSL_CTX_set_session_id_context.3 +++ b/src/lib/libssl/man/SSL_CTX_set_session_id_context.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: SSL_CTX_set_session_id_context.3,v 1.2 2016/12/01 19:50:12 schwarze Exp $ | 1 | .\" $OpenBSD: SSL_CTX_set_session_id_context.3,v 1.3 2017/04/10 15:37:55 schwarze Exp $ |
2 | .\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 | 2 | .\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 |
3 | .\" | 3 | .\" |
4 | .\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>. | 4 | .\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>. |
@@ -48,7 +48,7 @@ | |||
48 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | 48 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED |
49 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. | 49 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. |
50 | .\" | 50 | .\" |
51 | .Dd $Mdocdate: December 1 2016 $ | 51 | .Dd $Mdocdate: April 10 2017 $ |
52 | .Dt SSL_CTX_SET_SESSION_ID_CONTEXT 3 | 52 | .Dt SSL_CTX_SET_SESSION_ID_CONTEXT 3 |
53 | .Os | 53 | .Os |
54 | .Sh NAME | 54 | .Sh NAME |
@@ -149,4 +149,5 @@ The error is logged to the error stack. | |||
149 | The operation succeeded. | 149 | The operation succeeded. |
150 | .El | 150 | .El |
151 | .Sh SEE ALSO | 151 | .Sh SEE ALSO |
152 | .Xr ssl 3 | 152 | .Xr ssl 3 , |
153 | .Xr SSL_SESSION_set1_id_context 3 | ||
diff --git a/src/lib/libssl/man/SSL_SESSION_get0_peer.3 b/src/lib/libssl/man/SSL_SESSION_get0_peer.3 new file mode 100644 index 0000000000..2c5e6ce7e8 --- /dev/null +++ b/src/lib/libssl/man/SSL_SESSION_get0_peer.3 | |||
@@ -0,0 +1,76 @@ | |||
1 | .\" $OpenBSD: SSL_SESSION_get0_peer.3,v 1.1 2017/04/10 15:37:55 schwarze Exp $ | ||
2 | .\" OpenSSL SSL_SESSION_get0_peer.pod b31db505 Mar 24 16:01:50 2017 +0000 | ||
3 | .\" | ||
4 | .\" This file was written by Matt Caswell <matt@openssl.org> | ||
5 | .\" Copyright (c) 2017 The OpenSSL Project. All rights reserved. | ||
6 | .\" | ||
7 | .\" Redistribution and use in source and binary forms, with or without | ||
8 | .\" modification, are permitted provided that the following conditions | ||
9 | .\" are met: | ||
10 | .\" | ||
11 | .\" 1. Redistributions of source code must retain the above copyright | ||
12 | .\" notice, this list of conditions and the following disclaimer. | ||
13 | .\" | ||
14 | .\" 2. Redistributions in binary form must reproduce the above copyright | ||
15 | .\" notice, this list of conditions and the following disclaimer in | ||
16 | .\" the documentation and/or other materials provided with the | ||
17 | .\" distribution. | ||
18 | .\" | ||
19 | .\" 3. All advertising materials mentioning features or use of this | ||
20 | .\" software must display the following acknowledgment: | ||
21 | .\" "This product includes software developed by the OpenSSL Project | ||
22 | .\" for use in the OpenSSL Toolkit. (http://www.openssl.org/)" | ||
23 | .\" | ||
24 | .\" 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
25 | .\" endorse or promote products derived from this software without | ||
26 | .\" prior written permission. For written permission, please contact | ||
27 | .\" openssl-core@openssl.org. | ||
28 | .\" | ||
29 | .\" 5. Products derived from this software may not be called "OpenSSL" | ||
30 | .\" nor may "OpenSSL" appear in their names without prior written | ||
31 | .\" permission of the OpenSSL Project. | ||
32 | .\" | ||
33 | .\" 6. Redistributions of any form whatsoever must retain the following | ||
34 | .\" acknowledgment: | ||
35 | .\" "This product includes software developed by the OpenSSL Project | ||
36 | .\" for use in the OpenSSL Toolkit (http://www.openssl.org/)" | ||
37 | .\" | ||
38 | .\" THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
39 | .\" EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
40 | .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
41 | .\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
42 | .\" ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
43 | .\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
44 | .\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
45 | .\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
46 | .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
47 | .\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
48 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
49 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. | ||
50 | .\" | ||
51 | .Dd $Mdocdate: April 10 2017 $ | ||
52 | .Dt SSL_SESSION_GET0_PEER 3 | ||
53 | .Os | ||
54 | .Sh NAME | ||
55 | .Nm SSL_SESSION_get0_peer | ||
56 | .Nd get details about peer's certificate for a session | ||
57 | .Sh SYNOPSIS | ||
58 | .In openssl/ssl.h | ||
59 | .Ft X509 * | ||
60 | .Fo SSL_SESSION_get0_peer | ||
61 | .Fa "SSL_SESSION *s" | ||
62 | .Fc | ||
63 | .Sh DESCRIPTION | ||
64 | .Fn SSL_SESSION_get0_peer | ||
65 | returns a pointer to the peer certificate associated with the session | ||
66 | .Fa s | ||
67 | or | ||
68 | .Dv NULL | ||
69 | if no peer certificate is available. | ||
70 | The caller should not free the returned value, unless | ||
71 | .Xr X509_up_ref 3 | ||
72 | has also been called. | ||
73 | .Sh SEE ALSO | ||
74 | .Xr ssl 3 , | ||
75 | .Xr SSL_get_session 3 , | ||
76 | .Xr SSL_SESSION_new 3 | ||
diff --git a/src/lib/libssl/man/SSL_SESSION_get_compress_id.3 b/src/lib/libssl/man/SSL_SESSION_get_compress_id.3 new file mode 100644 index 0000000000..0287f371a8 --- /dev/null +++ b/src/lib/libssl/man/SSL_SESSION_get_compress_id.3 | |||
@@ -0,0 +1,72 @@ | |||
1 | .\" $OpenBSD: SSL_SESSION_get_compress_id.3,v 1.1 2017/04/10 15:37:55 schwarze Exp $ | ||
2 | .\" OpenSSL SSL_SESSION_get_compress_id.pod b31db505 Mar 24 16:01:50 2017 | ||
3 | .\" | ||
4 | .\" This file was written by Matt Caswell <matt@openssl.org> | ||
5 | .\" Copyright (c) 2017 The OpenSSL Project. All rights reserved. | ||
6 | .\" | ||
7 | .\" Redistribution and use in source and binary forms, with or without | ||
8 | .\" modification, are permitted provided that the following conditions | ||
9 | .\" are met: | ||
10 | .\" | ||
11 | .\" 1. Redistributions of source code must retain the above copyright | ||
12 | .\" notice, this list of conditions and the following disclaimer. | ||
13 | .\" | ||
14 | .\" 2. Redistributions in binary form must reproduce the above copyright | ||
15 | .\" notice, this list of conditions and the following disclaimer in | ||
16 | .\" the documentation and/or other materials provided with the | ||
17 | .\" distribution. | ||
18 | .\" | ||
19 | .\" 3. All advertising materials mentioning features or use of this | ||
20 | .\" software must display the following acknowledgment: | ||
21 | .\" "This product includes software developed by the OpenSSL Project | ||
22 | .\" for use in the OpenSSL Toolkit. (http://www.openssl.org/)" | ||
23 | .\" | ||
24 | .\" 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
25 | .\" endorse or promote products derived from this software without | ||
26 | .\" prior written permission. For written permission, please contact | ||
27 | .\" openssl-core@openssl.org. | ||
28 | .\" | ||
29 | .\" 5. Products derived from this software may not be called "OpenSSL" | ||
30 | .\" nor may "OpenSSL" appear in their names without prior written | ||
31 | .\" permission of the OpenSSL Project. | ||
32 | .\" | ||
33 | .\" 6. Redistributions of any form whatsoever must retain the following | ||
34 | .\" acknowledgment: | ||
35 | .\" "This product includes software developed by the OpenSSL Project | ||
36 | .\" for use in the OpenSSL Toolkit (http://www.openssl.org/)" | ||
37 | .\" | ||
38 | .\" THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
39 | .\" EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
40 | .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
41 | .\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
42 | .\" ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
43 | .\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
44 | .\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
45 | .\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
46 | .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
47 | .\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
48 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
49 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. | ||
50 | .\" | ||
51 | .Dd $Mdocdate: April 10 2017 $ | ||
52 | .Dt SSL_SESSION_GET_COMPRESS_ID 3 | ||
53 | .Os | ||
54 | .Sh NAME | ||
55 | .Nm SSL_SESSION_get_compress_id | ||
56 | .Nd get details about the compression associated with a session | ||
57 | .Sh SYNOPSIS | ||
58 | .In openssl/ssl.h | ||
59 | .Ft unsigned int | ||
60 | .Fo SSL_SESSION_get_compress_id | ||
61 | .Fa "const SSL_SESSION *s" | ||
62 | .Fc | ||
63 | .Sh DESCRIPTION | ||
64 | If compression has been negotiated for an ssl session, | ||
65 | .Fn SSL_SESSION_get_compress_id | ||
66 | returns the id for the compression method, or 0 otherwise. | ||
67 | The only built-in supported compression method is zlib, | ||
68 | which has an id of 1. | ||
69 | .Sh SEE ALSO | ||
70 | .Xr ssl 3 , | ||
71 | .Xr SSL_get_session 3 , | ||
72 | .Xr SSL_SESSION_new 3 | ||
diff --git a/src/lib/libssl/man/SSL_SESSION_get_id.3 b/src/lib/libssl/man/SSL_SESSION_get_id.3 new file mode 100644 index 0000000000..05b1fe53d9 --- /dev/null +++ b/src/lib/libssl/man/SSL_SESSION_get_id.3 | |||
@@ -0,0 +1,76 @@ | |||
1 | .\" $OpenBSD: SSL_SESSION_get_id.3,v 1.1 2017/04/10 15:37:55 schwarze Exp $ | ||
2 | .\" OpenSSL SSL_SESSION_set1_id.pod b31db505 Mar 24 16:01:50 2017 +0000 | ||
3 | .\" | ||
4 | .\" This file was written by Matt Caswell <matt@openssl.org> | ||
5 | .\" Copyright (c) 2017 The OpenSSL Project. All rights reserved. | ||
6 | .\" | ||
7 | .\" Redistribution and use in source and binary forms, with or without | ||
8 | .\" modification, are permitted provided that the following conditions | ||
9 | .\" are met: | ||
10 | .\" | ||
11 | .\" 1. Redistributions of source code must retain the above copyright | ||
12 | .\" notice, this list of conditions and the following disclaimer. | ||
13 | .\" | ||
14 | .\" 2. Redistributions in binary form must reproduce the above copyright | ||
15 | .\" notice, this list of conditions and the following disclaimer in | ||
16 | .\" the documentation and/or other materials provided with the | ||
17 | .\" distribution. | ||
18 | .\" | ||
19 | .\" 3. All advertising materials mentioning features or use of this | ||
20 | .\" software must display the following acknowledgment: | ||
21 | .\" "This product includes software developed by the OpenSSL Project | ||
22 | .\" for use in the OpenSSL Toolkit. (http://www.openssl.org/)" | ||
23 | .\" | ||
24 | .\" 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
25 | .\" endorse or promote products derived from this software without | ||
26 | .\" prior written permission. For written permission, please contact | ||
27 | .\" openssl-core@openssl.org. | ||
28 | .\" | ||
29 | .\" 5. Products derived from this software may not be called "OpenSSL" | ||
30 | .\" nor may "OpenSSL" appear in their names without prior written | ||
31 | .\" permission of the OpenSSL Project. | ||
32 | .\" | ||
33 | .\" 6. Redistributions of any form whatsoever must retain the following | ||
34 | .\" acknowledgment: | ||
35 | .\" "This product includes software developed by the OpenSSL Project | ||
36 | .\" for use in the OpenSSL Toolkit (http://www.openssl.org/)" | ||
37 | .\" | ||
38 | .\" THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
39 | .\" EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
40 | .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
41 | .\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
42 | .\" ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
43 | .\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
44 | .\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
45 | .\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
46 | .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
47 | .\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
48 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
49 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. | ||
50 | .\" | ||
51 | .Dd $Mdocdate: April 10 2017 $ | ||
52 | .Dt SSL_SESSION_GET_ID 3 | ||
53 | .Os | ||
54 | .Sh NAME | ||
55 | .Nm SSL_SESSION_get_id | ||
56 | .Nd get the SSL session ID | ||
57 | .Sh SYNOPSIS | ||
58 | .In openssl/ssl.h | ||
59 | .Ft const unsigned char * | ||
60 | .Fo SSL_SESSION_get_id | ||
61 | .Fa "const SSL_SESSION *s" | ||
62 | .Fa "unsigned int *len" | ||
63 | .Fc | ||
64 | .Sh DESCRIPTION | ||
65 | .Fn SSL_SESSION_get_id | ||
66 | returns a pointer to the internal session id value for the session | ||
67 | .Fa s . | ||
68 | The length of the id in bytes is stored in | ||
69 | .Pf * Fa len . | ||
70 | The length may be 0. | ||
71 | The caller should not free the returned pointer directly. | ||
72 | .Sh SEE ALSO | ||
73 | .Xr ssl 3 , | ||
74 | .Xr SSL_copy_session_id 3 , | ||
75 | .Xr SSL_get_session 3 , | ||
76 | .Xr SSL_SESSION_new 3 | ||
diff --git a/src/lib/libssl/man/SSL_SESSION_get_time.3 b/src/lib/libssl/man/SSL_SESSION_get_time.3 index 7eef62d78b..387a45f5e1 100644 --- a/src/lib/libssl/man/SSL_SESSION_get_time.3 +++ b/src/lib/libssl/man/SSL_SESSION_get_time.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: SSL_SESSION_get_time.3,v 1.2 2016/12/06 22:41:16 schwarze Exp $ | 1 | .\" $OpenBSD: SSL_SESSION_get_time.3,v 1.3 2017/04/10 15:37:55 schwarze Exp $ |
2 | .\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 | 2 | .\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 |
3 | .\" | 3 | .\" |
4 | .\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>. | 4 | .\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>. |
@@ -49,7 +49,7 @@ | |||
49 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | 49 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED |
50 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. | 50 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. |
51 | .\" | 51 | .\" |
52 | .Dd $Mdocdate: December 6 2016 $ | 52 | .Dd $Mdocdate: April 10 2017 $ |
53 | .Dt SSL_SESSION_GET_TIME 3 | 53 | .Dt SSL_SESSION_GET_TIME 3 |
54 | .Os | 54 | .Os |
55 | .Sh NAME | 55 | .Sh NAME |
@@ -143,4 +143,6 @@ pointer for the session | |||
143 | .Sh SEE ALSO | 143 | .Sh SEE ALSO |
144 | .Xr ssl 3 , | 144 | .Xr ssl 3 , |
145 | .Xr SSL_CTX_set_timeout 3 , | 145 | .Xr SSL_CTX_set_timeout 3 , |
146 | .Xr SSL_get_default_timeout 3 | 146 | .Xr SSL_get_default_timeout 3 , |
147 | .Xr SSL_get_session 3 , | ||
148 | .Xr SSL_SESSION_new 3 | ||
diff --git a/src/lib/libssl/man/SSL_SESSION_new.3 b/src/lib/libssl/man/SSL_SESSION_new.3 index 77e77e9105..54d22b8ed5 100644 --- a/src/lib/libssl/man/SSL_SESSION_new.3 +++ b/src/lib/libssl/man/SSL_SESSION_new.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: SSL_SESSION_new.3,v 1.1 2016/12/06 18:40:31 schwarze Exp $ | 1 | .\" $OpenBSD: SSL_SESSION_new.3,v 1.2 2017/04/10 15:37:55 schwarze Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org> | 3 | .\" Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org> |
4 | .\" | 4 | .\" |
@@ -14,7 +14,7 @@ | |||
14 | .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | 14 | .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
15 | .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | .\" | 16 | .\" |
17 | .Dd $Mdocdate: December 6 2016 $ | 17 | .Dd $Mdocdate: April 10 2017 $ |
18 | .Dt SSL_SESSION_NEW 3 | 18 | .Dt SSL_SESSION_NEW 3 |
19 | .Os | 19 | .Os |
20 | .Sh NAME | 20 | .Sh NAME |
@@ -54,9 +54,16 @@ returns | |||
54 | .Xr d2i_SSL_SESSION 3 , | 54 | .Xr d2i_SSL_SESSION 3 , |
55 | .Xr PEM_read_SSL_SESSION 3 , | 55 | .Xr PEM_read_SSL_SESSION 3 , |
56 | .Xr SSL_connect 3 , | 56 | .Xr SSL_connect 3 , |
57 | .Xr SSL_copy_session_id 3 , | ||
57 | .Xr SSL_CTX_add_session 3 , | 58 | .Xr SSL_CTX_add_session 3 , |
59 | .Xr SSL_CTX_sess_set_get_cb 3 , | ||
58 | .Xr SSL_get_session 3 , | 60 | .Xr SSL_get_session 3 , |
59 | .Xr SSL_SESSION_free 3 , | 61 | .Xr SSL_SESSION_free 3 , |
62 | .Xr SSL_SESSION_get0_peer 3 , | ||
63 | .Xr SSL_SESSION_get_compress_id 3 , | ||
60 | .Xr SSL_SESSION_get_ex_new_index 3 , | 64 | .Xr SSL_SESSION_get_ex_new_index 3 , |
65 | .Xr SSL_SESSION_get_id 3 , | ||
61 | .Xr SSL_SESSION_get_time 3 , | 66 | .Xr SSL_SESSION_get_time 3 , |
67 | .Xr SSL_SESSION_print 3 , | ||
68 | .Xr SSL_SESSION_set1_id_context 3 , | ||
62 | .Xr SSL_set_session 3 | 69 | .Xr SSL_set_session 3 |
diff --git a/src/lib/libssl/man/SSL_SESSION_set1_id_context.3 b/src/lib/libssl/man/SSL_SESSION_set1_id_context.3 new file mode 100644 index 0000000000..f7fa13ebcf --- /dev/null +++ b/src/lib/libssl/man/SSL_SESSION_set1_id_context.3 | |||
@@ -0,0 +1,83 @@ | |||
1 | .\" $OpenBSD: SSL_SESSION_set1_id_context.3,v 1.1 2017/04/10 15:37:55 schwarze Exp $ | ||
2 | .\" OpenSSL SSL_SESSION_get0_id_context.pod b31db505 Mar 24 16:01:50 2017 | ||
3 | .\" | ||
4 | .\" This file was written by Matt Caswell <matt@openssl.org> | ||
5 | .\" Copyright (c) 2017 The OpenSSL Project. All rights reserved. | ||
6 | .\" | ||
7 | .\" Redistribution and use in source and binary forms, with or without | ||
8 | .\" modification, are permitted provided that the following conditions | ||
9 | .\" are met: | ||
10 | .\" | ||
11 | .\" 1. Redistributions of source code must retain the above copyright | ||
12 | .\" notice, this list of conditions and the following disclaimer. | ||
13 | .\" | ||
14 | .\" 2. Redistributions in binary form must reproduce the above copyright | ||
15 | .\" notice, this list of conditions and the following disclaimer in | ||
16 | .\" the documentation and/or other materials provided with the | ||
17 | .\" distribution. | ||
18 | .\" | ||
19 | .\" 3. All advertising materials mentioning features or use of this | ||
20 | .\" software must display the following acknowledgment: | ||
21 | .\" "This product includes software developed by the OpenSSL Project | ||
22 | .\" for use in the OpenSSL Toolkit. (http://www.openssl.org/)" | ||
23 | .\" | ||
24 | .\" 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
25 | .\" endorse or promote products derived from this software without | ||
26 | .\" prior written permission. For written permission, please contact | ||
27 | .\" openssl-core@openssl.org. | ||
28 | .\" | ||
29 | .\" 5. Products derived from this software may not be called "OpenSSL" | ||
30 | .\" nor may "OpenSSL" appear in their names without prior written | ||
31 | .\" permission of the OpenSSL Project. | ||
32 | .\" | ||
33 | .\" 6. Redistributions of any form whatsoever must retain the following | ||
34 | .\" acknowledgment: | ||
35 | .\" "This product includes software developed by the OpenSSL Project | ||
36 | .\" for use in the OpenSSL Toolkit (http://www.openssl.org/)" | ||
37 | .\" | ||
38 | .\" THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
39 | .\" EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
40 | .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
41 | .\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
42 | .\" ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
43 | .\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
44 | .\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
45 | .\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
46 | .\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
47 | .\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
48 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
49 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. | ||
50 | .\" | ||
51 | .Dd $Mdocdate: April 10 2017 $ | ||
52 | .Dt SSL_SESSION_SET1_ID_CONTEXT 3 | ||
53 | .Os | ||
54 | .Sh NAME | ||
55 | .Nm SSL_SESSION_set1_id_context | ||
56 | .Nd set the SSL ID context associated with a session | ||
57 | .Sh SYNOPSIS | ||
58 | .In openssl/ssl.h | ||
59 | .Ft int | ||
60 | .Fo SSL_SESSION_set1_id_context | ||
61 | .Fa "SSL_SESSION *s" | ||
62 | .Fa "const unsigned char *sid_ctx" | ||
63 | .Fa "unsigned int sid_ctx_len" | ||
64 | .Fc | ||
65 | .Sh DESCRIPTION | ||
66 | .Fn SSL_SESSION_set1_id_context | ||
67 | takes a copy of the provided ID context given in | ||
68 | .Fa sid_ctx | ||
69 | and associates it with the session | ||
70 | .Fa s . | ||
71 | The length of the ID context is given by | ||
72 | .Fa sid_ctx_len | ||
73 | which must not exceed | ||
74 | .Dv SSL_MAX_SID_CTX_LENGTH | ||
75 | bytes. | ||
76 | .Sh RETURN VALUES | ||
77 | .Fn SSL_SESSION_set1_id_context | ||
78 | returns 1 on success or 0 on error. | ||
79 | .Sh SEE ALSO | ||
80 | .Xr ssl 3 , | ||
81 | .Xr SSL_CTX_set_session_id_context 3 , | ||
82 | .Xr SSL_get_session 3 , | ||
83 | .Xr SSL_SESSION_new 3 | ||
diff --git a/src/lib/libssl/man/SSL_copy_session_id.3 b/src/lib/libssl/man/SSL_copy_session_id.3 index 2f96ecffd7..52a5aea314 100644 --- a/src/lib/libssl/man/SSL_copy_session_id.3 +++ b/src/lib/libssl/man/SSL_copy_session_id.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: SSL_copy_session_id.3,v 1.1 2016/12/07 18:09:31 schwarze Exp $ | 1 | .\" $OpenBSD: SSL_copy_session_id.3,v 1.2 2017/04/10 15:37:55 schwarze Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org> | 3 | .\" Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org> |
4 | .\" | 4 | .\" |
@@ -14,7 +14,7 @@ | |||
14 | .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | 14 | .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
15 | .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | .\" | 16 | .\" |
17 | .Dd $Mdocdate: December 7 2016 $ | 17 | .Dd $Mdocdate: April 10 2017 $ |
18 | .Dt SSL_COPY_SESSION_ID 3 | 18 | .Dt SSL_COPY_SESSION_ID 3 |
19 | .Os | 19 | .Os |
20 | .Sh NAME | 20 | .Sh NAME |
@@ -59,6 +59,8 @@ and by | |||
59 | .Xr BIO_ssl_copy_session_id 3 , | 59 | .Xr BIO_ssl_copy_session_id 3 , |
60 | .Xr SSL_dup 3 , | 60 | .Xr SSL_dup 3 , |
61 | .Xr SSL_get_session 3 , | 61 | .Xr SSL_get_session 3 , |
62 | .Xr SSL_SESSION_get_id 3 , | ||
63 | .Xr SSL_SESSION_new 3 , | ||
62 | .Xr SSL_set_session 3 , | 64 | .Xr SSL_set_session 3 , |
63 | .Xr SSL_set_session_id_context 3 | 65 | .Xr SSL_set_session_id_context 3 |
64 | .Sh HISTORY | 66 | .Sh HISTORY |
diff --git a/src/lib/libssl/man/SSL_get_session.3 b/src/lib/libssl/man/SSL_get_session.3 index 2591fce727..8a1efa674d 100644 --- a/src/lib/libssl/man/SSL_get_session.3 +++ b/src/lib/libssl/man/SSL_get_session.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: SSL_get_session.3,v 1.2 2016/12/03 09:13:56 schwarze Exp $ | 1 | .\" $OpenBSD: SSL_get_session.3,v 1.3 2017/04/10 15:37:55 schwarze Exp $ |
2 | .\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 | 2 | .\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 |
3 | .\" | 3 | .\" |
4 | .\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>. | 4 | .\" This file was written by Lutz Jaenicke <jaenicke@openssl.org>. |
@@ -49,7 +49,7 @@ | |||
49 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | 49 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED |
50 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. | 50 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. |
51 | .\" | 51 | .\" |
52 | .Dd $Mdocdate: December 3 2016 $ | 52 | .Dd $Mdocdate: April 10 2017 $ |
53 | .Dt SSL_GET_SESSION 3 | 53 | .Dt SSL_GET_SESSION 3 |
54 | .Os | 54 | .Os |
55 | .Sh NAME | 55 | .Sh NAME |
@@ -142,4 +142,10 @@ session. | |||
142 | .Xr ssl 3 , | 142 | .Xr ssl 3 , |
143 | .Xr SSL_clear 3 , | 143 | .Xr SSL_clear 3 , |
144 | .Xr SSL_free 3 , | 144 | .Xr SSL_free 3 , |
145 | .Xr SSL_SESSION_free 3 | 145 | .Xr SSL_SESSION_free 3 , |
146 | .Xr SSL_SESSION_get0_peer 3 , | ||
147 | .Xr SSL_SESSION_get_compress_id 3 , | ||
148 | .Xr SSL_SESSION_get_id 3 , | ||
149 | .Xr SSL_SESSION_get_time 3 , | ||
150 | .Xr SSL_SESSION_new 3 , | ||
151 | .Xr SSL_SESSION_print 3 | ||
diff --git a/src/lib/libssl/man/ssl.3 b/src/lib/libssl/man/ssl.3 index 25834c37a8..dd3a3451e1 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.6 2017/04/10 14:00:51 schwarze Exp $ | 1 | .\" $OpenBSD: ssl.3,v 1.7 2017/04/10 15:37:55 schwarze Exp $ |
2 | .\" OpenSSL e330f55d Nov 11 00:51:04 2016 +0100 | 2 | .\" OpenSSL e330f55d Nov 11 00:51:04 2016 +0100 |
3 | .\" | 3 | .\" |
4 | .\" This file was written by Ralf S. Engelschall <rse@openssl.org>, | 4 | .\" This file was written by Ralf S. Engelschall <rse@openssl.org>, |
@@ -238,8 +238,12 @@ Constructors and destructors: | |||
238 | .Xr SSL_SESSION_free 3 | 238 | .Xr SSL_SESSION_free 3 |
239 | .Pp | 239 | .Pp |
240 | Accessors: | 240 | Accessors: |
241 | .Xr SSL_SESSION_get_compress_id 3 , | ||
241 | .Xr SSL_SESSION_get_ex_new_index 3 , | 242 | .Xr SSL_SESSION_get_ex_new_index 3 , |
242 | .Xr SSL_SESSION_get_time 3 | 243 | .Xr SSL_SESSION_get_id 3 , |
244 | .Xr SSL_SESSION_get_time 3 , | ||
245 | .Xr SSL_SESSION_get0_peer 3 , | ||
246 | .Xr SSL_SESSION_set1_id_context 3 | ||
243 | .Pp | 247 | .Pp |
244 | Encoding and decoding: | 248 | Encoding and decoding: |
245 | .Xr d2i_SSL_SESSION 3 , | 249 | .Xr d2i_SSL_SESSION 3 , |