diff options
author | schwarze <> | 2017-08-21 07:35:30 +0000 |
---|---|---|
committer | schwarze <> | 2017-08-21 07:35:30 +0000 |
commit | bff7dfaf7344e67f7e17f2f11af2300ffc86ad3b (patch) | |
tree | 2f51db3eeb9263e9c518369642c3003582852129 | |
parent | 41bf8f2b2f43745b983344fd4d5fc6a009b04217 (diff) | |
download | openbsd-bff7dfaf7344e67f7e17f2f11af2300ffc86ad3b.tar.gz openbsd-bff7dfaf7344e67f7e17f2f11af2300ffc86ad3b.tar.bz2 openbsd-bff7dfaf7344e67f7e17f2f11af2300ffc86ad3b.zip |
Delete non-existent functions SSL_add_session() and SSL_remove_session() and
clarify that SSL_CTX_remove_session(3) marks the session as non-resumable.
From Rich Salz <rsalz at openssl dot org>
via OpenSSL commit 1722496f Jun 8 15:18:38 2017 -0400
and from Matt Caswell <matt at openssl dot org>
via OpenSSL commit b8964668 Apr 26 15:16:18 2017 +0100.
-rw-r--r-- | src/lib/libssl/man/SSL_CTX_add_session.3 | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/src/lib/libssl/man/SSL_CTX_add_session.3 b/src/lib/libssl/man/SSL_CTX_add_session.3 index 44c3085a3f..b99639a815 100644 --- a/src/lib/libssl/man/SSL_CTX_add_session.3 +++ b/src/lib/libssl/man/SSL_CTX_add_session.3 | |||
@@ -1,5 +1,5 @@ | |||
1 | .\" $OpenBSD: SSL_CTX_add_session.3,v 1.2 2016/11/30 13:21:23 schwarze Exp $ | 1 | .\" $OpenBSD: SSL_CTX_add_session.3,v 1.3 2017/08/21 07:35:30 schwarze Exp $ |
2 | .\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 | 2 | .\" OpenSSL SSL_CTX_add_session.pod 1722496f Jun 8 15:18:38 2017 -0400 |
3 | .\" | 3 | .\" |
4 | .\" This file was written by Lutz Jaenicke <jaenicke@openssl.org> and | 4 | .\" This file was written by Lutz Jaenicke <jaenicke@openssl.org> and |
5 | .\" Geoff Thorpe <geoff@openssl.org>. | 5 | .\" Geoff Thorpe <geoff@openssl.org>. |
@@ -49,25 +49,19 @@ | |||
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: November 30 2016 $ | 52 | .Dd $Mdocdate: August 21 2017 $ |
53 | .Dt SSL_CTX_ADD_SESSION 3 | 53 | .Dt SSL_CTX_ADD_SESSION 3 |
54 | .Os | 54 | .Os |
55 | .Sh NAME | 55 | .Sh NAME |
56 | .Nm SSL_CTX_add_session , | 56 | .Nm SSL_CTX_add_session , |
57 | .Nm SSL_add_session , | 57 | .Nm SSL_CTX_remove_session |
58 | .Nm SSL_CTX_remove_session , | ||
59 | .Nm SSL_remove_session | ||
60 | .Nd manipulate session cache | 58 | .Nd manipulate session cache |
61 | .Sh SYNOPSIS | 59 | .Sh SYNOPSIS |
62 | .In openssl/ssl.h | 60 | .In openssl/ssl.h |
63 | .Ft int | 61 | .Ft int |
64 | .Fn SSL_CTX_add_session "SSL_CTX *ctx" "SSL_SESSION *c" | 62 | .Fn SSL_CTX_add_session "SSL_CTX *ctx" "SSL_SESSION *c" |
65 | .Ft int | 63 | .Ft int |
66 | .Fn SSL_add_session "SSL_CTX *ctx" "SSL_SESSION *c" | ||
67 | .Ft int | ||
68 | .Fn SSL_CTX_remove_session "SSL_CTX *ctx" "SSL_SESSION *c" | 64 | .Fn SSL_CTX_remove_session "SSL_CTX *ctx" "SSL_SESSION *c" |
69 | .Ft int | ||
70 | .Fn SSL_remove_session "SSL_CTX *ctx" "SSL_SESSION *c" | ||
71 | .Sh DESCRIPTION | 65 | .Sh DESCRIPTION |
72 | .Fn SSL_CTX_add_session | 66 | .Fn SSL_CTX_add_session |
73 | adds the session | 67 | adds the session |
@@ -85,18 +79,12 @@ the old session is removed by calling | |||
85 | removes the session | 79 | removes the session |
86 | .Fa c | 80 | .Fa c |
87 | from the context | 81 | from the context |
88 | .Fa ctx . | 82 | .Fa ctx |
83 | and marks it as non-resumable. | ||
89 | .Xr SSL_SESSION_free 3 | 84 | .Xr SSL_SESSION_free 3 |
90 | is called once for | 85 | is called once for |
91 | .Fa c . | 86 | .Fa c . |
92 | .Pp | 87 | .Pp |
93 | .Fn SSL_add_session | ||
94 | and | ||
95 | .Fn SSL_remove_session | ||
96 | are synonyms for their | ||
97 | .Fn SSL_CTX_* | ||
98 | counterparts. | ||
99 | .Sh NOTES | ||
100 | When adding a new session to the internal session cache, it is examined | 88 | When adding a new session to the internal session cache, it is examined |
101 | whether a session with the same session id already exists. | 89 | whether a session with the same session id already exists. |
102 | In this case it is assumed that both sessions are identical. | 90 | In this case it is assumed that both sessions are identical. |