diff options
author | tb <> | 2021-03-19 20:31:49 +0000 |
---|---|---|
committer | tb <> | 2021-03-19 20:31:49 +0000 |
commit | d0d6b7864dc01a292f38d632aa3e5a1272252ef7 (patch) | |
tree | 7c883ed0edc8cddeafd476c118a738a539c6e1a7 | |
parent | 4657200c33926791c0e820fa76d86d27b549f07f (diff) | |
download | openbsd-d0d6b7864dc01a292f38d632aa3e5a1272252ef7.tar.gz openbsd-d0d6b7864dc01a292f38d632aa3e5a1272252ef7.tar.bz2 openbsd-d0d6b7864dc01a292f38d632aa3e5a1272252ef7.zip |
Prepare documenting SSL_use_certificate_chain_file
-rw-r--r-- | src/lib/libssl/man/SSL_CTX_use_certificate.3 | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/lib/libssl/man/SSL_CTX_use_certificate.3 b/src/lib/libssl/man/SSL_CTX_use_certificate.3 index 3fa95c71d2..a9f0aad98f 100644 --- a/src/lib/libssl/man/SSL_CTX_use_certificate.3 +++ b/src/lib/libssl/man/SSL_CTX_use_certificate.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: SSL_CTX_use_certificate.3,v 1.14 2019/11/14 20:48:48 millert Exp $ | 1 | .\" $OpenBSD: SSL_CTX_use_certificate.3,v 1.15 2021/03/19 20:31:49 tb Exp $ |
2 | .\" full merge up to: OpenSSL 3aaa1bd0 Mar 28 16:35:25 2017 +1000 | 2 | .\" full merge up to: OpenSSL 3aaa1bd0 Mar 28 16:35:25 2017 +1000 |
3 | .\" selective merge up to: OpenSSL d1f7a1e6 Apr 26 14:05:40 2018 +0100 | 3 | .\" selective merge up to: OpenSSL d1f7a1e6 Apr 26 14:05:40 2018 +0100 |
4 | .\" | 4 | .\" |
@@ -50,7 +50,7 @@ | |||
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: November 14 2019 $ | 53 | .Dd $Mdocdate: March 19 2021 $ |
54 | .Dt SSL_CTX_USE_CERTIFICATE 3 | 54 | .Dt SSL_CTX_USE_CERTIFICATE 3 |
55 | .Os | 55 | .Os |
56 | .Sh NAME | 56 | .Sh NAME |
@@ -59,6 +59,9 @@ | |||
59 | .Nm SSL_CTX_use_certificate_file , | 59 | .Nm SSL_CTX_use_certificate_file , |
60 | .Nm SSL_use_certificate , | 60 | .Nm SSL_use_certificate , |
61 | .Nm SSL_use_certificate_ASN1 , | 61 | .Nm SSL_use_certificate_ASN1 , |
62 | .ig \" will appear in a library bump before Ox 6.9 | ||
63 | .Nm SSL_use_certificate_chain_file , | ||
64 | .. | ||
62 | .Nm SSL_use_certificate_file , | 65 | .Nm SSL_use_certificate_file , |
63 | .Nm SSL_CTX_use_certificate_chain_file , | 66 | .Nm SSL_CTX_use_certificate_chain_file , |
64 | .Nm SSL_CTX_use_certificate_chain_mem , | 67 | .Nm SSL_CTX_use_certificate_chain_mem , |
@@ -89,6 +92,10 @@ | |||
89 | .Fn SSL_use_certificate "SSL *ssl" "X509 *x" | 92 | .Fn SSL_use_certificate "SSL *ssl" "X509 *x" |
90 | .Ft int | 93 | .Ft int |
91 | .Fn SSL_use_certificate_ASN1 "SSL *ssl" "unsigned char *d" "int len" | 94 | .Fn SSL_use_certificate_ASN1 "SSL *ssl" "unsigned char *d" "int len" |
95 | .ig | ||
96 | .Ft int | ||
97 | .Fn SSL_use_certificate_chain_file "SSL *ssl" "const char *file" | ||
98 | .. | ||
92 | .Ft int | 99 | .Ft int |
93 | .Fn SSL_use_certificate_file "SSL *ssl" "const char *file" "int type" | 100 | .Fn SSL_use_certificate_file "SSL *ssl" "const char *file" "int type" |
94 | .Ft int | 101 | .Ft int |
@@ -219,6 +226,10 @@ The certificates must be in PEM format and must be sorted starting with the | |||
219 | subject's certificate (actual client or server certificate), | 226 | subject's certificate (actual client or server certificate), |
220 | followed by intermediate CA certificates if applicable, | 227 | followed by intermediate CA certificates if applicable, |
221 | and ending at the highest level (root) CA. | 228 | and ending at the highest level (root) CA. |
229 | .ig | ||
230 | With the exception of | ||
231 | .Fn SSL_use_certificate_chain_file , | ||
232 | .. | ||
222 | There is no corresponding function working on a single | 233 | There is no corresponding function working on a single |
223 | .Vt SSL | 234 | .Vt SSL |
224 | object. | 235 | object. |
@@ -428,6 +439,12 @@ All these functions have been available since | |||
428 | .Fn SSL_CTX_use_certificate_chain_file | 439 | .Fn SSL_CTX_use_certificate_chain_file |
429 | first appeared in OpenSSL 0.9.4 and has been available since | 440 | first appeared in OpenSSL 0.9.4 and has been available since |
430 | .Ox 2.6 . | 441 | .Ox 2.6 . |
442 | .ig | ||
443 | .Pp | ||
444 | .Fn SSL_use_certificate_chain_file | ||
445 | first appeared in OpenSSL 1.1.0 and has been available since | ||
446 | .Ox 6.9 . | ||
447 | .. | ||
431 | .Pp | 448 | .Pp |
432 | Support for DER encoded private keys | 449 | Support for DER encoded private keys |
433 | .Pq Dv SSL_FILETYPE_ASN1 | 450 | .Pq Dv SSL_FILETYPE_ASN1 |