diff options
author | schwarze <> | 2018-03-24 00:11:37 +0000 |
---|---|---|
committer | schwarze <> | 2018-03-24 00:11:37 +0000 |
commit | 6e7670093d2de27866196782a4d8bf8d9cf4b227 (patch) | |
tree | 8e1333569382a8ff9121e940831f8c1b78d3f6f4 /src | |
parent | d199c218f2fc113446ed8e069a2dbe49d6699468 (diff) | |
download | openbsd-6e7670093d2de27866196782a4d8bf8d9cf4b227.tar.gz openbsd-6e7670093d2de27866196782a4d8bf8d9cf4b227.tar.bz2 openbsd-6e7670093d2de27866196782a4d8bf8d9cf4b227.zip |
ouch, previous was wrong; revert it and fix HISTORY instead
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libssl/man/SSL_CTX_set_tlsext_status_cb.3 | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/src/lib/libssl/man/SSL_CTX_set_tlsext_status_cb.3 b/src/lib/libssl/man/SSL_CTX_set_tlsext_status_cb.3 index 0245668b66..b57c28b5a9 100644 --- a/src/lib/libssl/man/SSL_CTX_set_tlsext_status_cb.3 +++ b/src/lib/libssl/man/SSL_CTX_set_tlsext_status_cb.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: SSL_CTX_set_tlsext_status_cb.3,v 1.5 2018/03/23 23:59:06 schwarze Exp $ | 1 | .\" $OpenBSD: SSL_CTX_set_tlsext_status_cb.3,v 1.6 2018/03/24 00:11:37 schwarze Exp $ |
2 | .\" full merge up to: OpenSSL 43c34894 Nov 30 16:04:51 2015 +0000 | 2 | .\" full merge up to: OpenSSL 43c34894 Nov 30 16:04:51 2015 +0000 |
3 | .\" selective merge up to: OpenSSL e9b77246 Jan 20 19:58:49 2017 +0100 | 3 | .\" selective merge up to: OpenSSL e9b77246 Jan 20 19:58:49 2017 +0100 |
4 | .\" | 4 | .\" |
@@ -49,12 +49,14 @@ | |||
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: March 23 2018 $ | 52 | .Dd $Mdocdate: March 24 2018 $ |
53 | .Dt SSL_CTX_SET_TLSEXT_STATUS_CB 3 | 53 | .Dt SSL_CTX_SET_TLSEXT_STATUS_CB 3 |
54 | .Os | 54 | .Os |
55 | .Sh NAME | 55 | .Sh NAME |
56 | .Nm SSL_CTX_set_tlsext_status_cb , | 56 | .Nm SSL_CTX_set_tlsext_status_cb , |
57 | .Nm SSL_CTX_get_tlsext_status_cb , | ||
57 | .Nm SSL_CTX_set_tlsext_status_arg , | 58 | .Nm SSL_CTX_set_tlsext_status_arg , |
59 | .Nm SSL_CTX_get_tlsext_status_arg , | ||
58 | .Nm SSL_set_tlsext_status_type , | 60 | .Nm SSL_set_tlsext_status_type , |
59 | .Nm SSL_get_tlsext_status_ocsp_resp , | 61 | .Nm SSL_get_tlsext_status_ocsp_resp , |
60 | .Nm SSL_set_tlsext_status_ocsp_resp | 62 | .Nm SSL_set_tlsext_status_ocsp_resp |
@@ -67,11 +69,21 @@ | |||
67 | .Fa "int (*callback)(SSL *, void *)" | 69 | .Fa "int (*callback)(SSL *, void *)" |
68 | .Fc | 70 | .Fc |
69 | .Ft long | 71 | .Ft long |
72 | .Fo SSL_CTX_get_tlsext_status_cb | ||
73 | .Fa "SSL_CTX *ctx" | ||
74 | .Fa "int (*callback)(SSL *, void *)" | ||
75 | .Fc | ||
76 | .Ft long | ||
70 | .Fo SSL_CTX_set_tlsext_status_arg | 77 | .Fo SSL_CTX_set_tlsext_status_arg |
71 | .Fa "SSL_CTX *ctx" | 78 | .Fa "SSL_CTX *ctx" |
72 | .Fa "void *arg" | 79 | .Fa "void *arg" |
73 | .Fc | 80 | .Fc |
74 | .Ft long | 81 | .Ft long |
82 | .Fo SSL_CTX_get_tlsext_status_arg | ||
83 | .Fa "SSL_CTX *ctx" | ||
84 | .Fa "void **arg" | ||
85 | .Fc | ||
86 | .Ft long | ||
75 | .Fo SSL_set_tlsext_status_type | 87 | .Fo SSL_set_tlsext_status_type |
76 | .Fa "SSL *s" | 88 | .Fa "SSL *s" |
77 | .Fa "int type" | 89 | .Fa "int type" |
@@ -113,6 +125,13 @@ Note that the callback will not be called in the event of a handshake | |||
113 | where session resumption occurs (because there are no Certificates | 125 | where session resumption occurs (because there are no Certificates |
114 | exchanged in such a handshake). | 126 | exchanged in such a handshake). |
115 | .Pp | 127 | .Pp |
128 | The callback previously set via | ||
129 | .Fn SSL_CTX_set_tlsext_status_cb | ||
130 | can be retrieved by calling | ||
131 | .Fn SSL_CTX_get_tlsext_status_cb , | ||
132 | and the argument by calling | ||
133 | .Fn SSL_CTX_get_tlsext_status_arg . | ||
134 | .Pp | ||
116 | The response returned by the server can be obtained via a call to | 135 | The response returned by the server can be obtained via a call to |
117 | .Fn SSL_get_tlsext_status_ocsp_resp . | 136 | .Fn SSL_get_tlsext_status_ocsp_resp . |
118 | The value | 137 | The value |
@@ -156,7 +175,9 @@ The callback when used on the server side should return with either | |||
156 | (meaning that a fatal error has occurred). | 175 | (meaning that a fatal error has occurred). |
157 | .Pp | 176 | .Pp |
158 | .Fn SSL_CTX_set_tlsext_status_cb , | 177 | .Fn SSL_CTX_set_tlsext_status_cb , |
178 | .Fn SSL_CTX_get_tlsext_status_cb , | ||
159 | .Fn SSL_CTX_set_tlsext_status_arg , | 179 | .Fn SSL_CTX_set_tlsext_status_arg , |
180 | .Fn SSL_CTX_get_tlsext_status_arg , | ||
160 | .Fn SSL_set_tlsext_status_type , | 181 | .Fn SSL_set_tlsext_status_type , |
161 | and | 182 | and |
162 | .Fn SSL_set_tlsext_status_ocsp_resp | 183 | .Fn SSL_set_tlsext_status_ocsp_resp |
@@ -176,3 +197,9 @@ and | |||
176 | .Fn SSL_set_tlsext_status_ocsp_resp | 197 | .Fn SSL_set_tlsext_status_ocsp_resp |
177 | first appeared in OpenSSL 0.9.8h and have been available since | 198 | first appeared in OpenSSL 0.9.8h and have been available since |
178 | .Ox 4.5 . | 199 | .Ox 4.5 . |
200 | .Pp | ||
201 | .Fn SSL_CTX_get_tlsext_status_cb | ||
202 | and | ||
203 | .Fn SSL_CTX_get_tlsext_status_arg | ||
204 | first appeared in OpenSSL 1.1.0 and have been available since | ||
205 | .Ox 6.3 . | ||