diff options
author | schwarze <> | 2020-01-02 09:09:16 +0000 |
---|---|---|
committer | schwarze <> | 2020-01-02 09:09:16 +0000 |
commit | c4e16f535822a087101ec35b3a7951a777beebd0 (patch) | |
tree | 1e950dfaf2db4a7c2cf06e70a0e397591448ab8e | |
parent | d7e8782493bda5a46e15fb13e492e89970fed909 (diff) | |
download | openbsd-c4e16f535822a087101ec35b3a7951a777beebd0.tar.gz openbsd-c4e16f535822a087101ec35b3a7951a777beebd0.tar.bz2 openbsd-c4e16f535822a087101ec35b3a7951a777beebd0.zip |
In ssl.h rev. 1.167 and s3_lib.c rev. 1.188, jsing@ provided
the new function SSL_CTX_get_extra_chain_certs_only(3) and changed
the semantics of the existing SSL_CTX_get_extra_chain_certs(3) API
from the former OpenSSL 1.0.1 behaviour to the new, incompatible
OpenSSL 1.0.2 behaviour. Adjust the documentation.
OK jsing@ beck@ inoguchi@
-rw-r--r-- | src/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/src/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 b/src/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 index a6d869b335..4c731309e4 100644 --- a/src/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 +++ b/src/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: SSL_CTX_add_extra_chain_cert.3,v 1.6 2019/04/05 18:29:43 schwarze Exp $ | 1 | .\" $OpenBSD: SSL_CTX_add_extra_chain_cert.3,v 1.7 2020/01/02 09:09:16 schwarze Exp $ |
2 | .\" full merge up to: OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 | 2 | .\" full merge up to: OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 |
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 |
@@ -50,11 +50,12 @@ | |||
50 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | 50 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED |
51 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. | 51 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. |
52 | .\" | 52 | .\" |
53 | .Dd $Mdocdate: April 5 2019 $ | 53 | .Dd $Mdocdate: January 2 2020 $ |
54 | .Dt SSL_CTX_ADD_EXTRA_CHAIN_CERT 3 | 54 | .Dt SSL_CTX_ADD_EXTRA_CHAIN_CERT 3 |
55 | .Os | 55 | .Os |
56 | .Sh NAME | 56 | .Sh NAME |
57 | .Nm SSL_CTX_add_extra_chain_cert , | 57 | .Nm SSL_CTX_add_extra_chain_cert , |
58 | .Nm SSL_CTX_get_extra_chain_certs_only , | ||
58 | .Nm SSL_CTX_get_extra_chain_certs , | 59 | .Nm SSL_CTX_get_extra_chain_certs , |
59 | .Nm SSL_CTX_clear_extra_chain_certs | 60 | .Nm SSL_CTX_clear_extra_chain_certs |
60 | .Nd add, retrieve, and clear extra chain certificates | 61 | .Nd add, retrieve, and clear extra chain certificates |
@@ -63,6 +64,8 @@ | |||
63 | .Ft long | 64 | .Ft long |
64 | .Fn SSL_CTX_add_extra_chain_cert "SSL_CTX *ctx" "X509 *x509" | 65 | .Fn SSL_CTX_add_extra_chain_cert "SSL_CTX *ctx" "X509 *x509" |
65 | .Ft long | 66 | .Ft long |
67 | .Fn SSL_CTX_get_extra_chain_certs_only "SSL_CTX *ctx" "STACK_OF(X509) **certs" | ||
68 | .Ft long | ||
66 | .Fn SSL_CTX_get_extra_chain_certs "SSL_CTX *ctx" "STACK_OF(X509) **certs" | 69 | .Fn SSL_CTX_get_extra_chain_certs "SSL_CTX *ctx" "STACK_OF(X509) **certs" |
67 | .Ft long | 70 | .Ft long |
68 | .Fn SSL_CTX_clear_extra_chain_certs "SSL_CTX *ctx" | 71 | .Fn SSL_CTX_clear_extra_chain_certs "SSL_CTX *ctx" |
@@ -74,10 +77,20 @@ to the extra chain certificates associated with | |||
74 | .Fa ctx . | 77 | .Fa ctx . |
75 | Several certificates can be added one after another. | 78 | Several certificates can be added one after another. |
76 | .Pp | 79 | .Pp |
77 | .Fn SSL_CTX_get_extra_chain_certs | 80 | .Fn SSL_CTX_get_extra_chain_certs_only |
78 | retrieves an internal pointer to the stack of extra chain certificates | 81 | retrieves an internal pointer to the stack of extra chain certificates |
79 | associated with | 82 | associated with |
80 | .Fa ctx . | 83 | .Fa ctx , |
84 | or set | ||
85 | .Pf * Fa certs | ||
86 | to | ||
87 | .Dv NULL | ||
88 | if there are none. | ||
89 | .Pp | ||
90 | .Fn SSL_CTX_get_extra_chain_certs | ||
91 | does the same except that it retrieves an internal pointer | ||
92 | to the chain associated with the certificate | ||
93 | if there are no extra chain certificates. | ||
81 | .Pp | 94 | .Pp |
82 | .Fn SSL_CTX_clear_extra_chain_certs | 95 | .Fn SSL_CTX_clear_extra_chain_certs |
83 | clears all extra chain certificates associated with | 96 | clears all extra chain certificates associated with |
@@ -123,6 +136,10 @@ and | |||
123 | .Fn SSL_CTX_clear_extra_chain_certs | 136 | .Fn SSL_CTX_clear_extra_chain_certs |
124 | first appeared in OpenSSL 1.0.1 and have been available since | 137 | first appeared in OpenSSL 1.0.1 and have been available since |
125 | .Ox 5.3 . | 138 | .Ox 5.3 . |
139 | .Pp | ||
140 | .Fn SSL_CTX_get_extra_chain_certs_only | ||
141 | first appeared in OpenSSL 1.0.2 and has been available since | ||
142 | .Ox 6.7 . | ||
126 | .Sh CAVEATS | 143 | .Sh CAVEATS |
127 | Certificates added with | 144 | Certificates added with |
128 | .Fn SSL_CTX_add_extra_chain_cert | 145 | .Fn SSL_CTX_add_extra_chain_cert |