diff options
author | schwarze <> | 2018-04-08 01:00:15 +0000 |
---|---|---|
committer | schwarze <> | 2018-04-08 01:00:15 +0000 |
commit | cb3aa30294676dd1f9e40ea8ce72c0bd0e4f42d9 (patch) | |
tree | 6a37c59c7220a509f164f82b3d719c637dbdf82f /src | |
parent | 494d0b1c81ebdab6484e0cc958d3ca353e97ecd8 (diff) | |
download | openbsd-cb3aa30294676dd1f9e40ea8ce72c0bd0e4f42d9.tar.gz openbsd-cb3aa30294676dd1f9e40ea8ce72c0bd0e4f42d9.tar.bz2 openbsd-cb3aa30294676dd1f9e40ea8ce72c0bd0e4f42d9.zip |
sort the list of data structures and add the missing ECDH and ECDSA;
triggered by OpenSSL commit a73d990e Feb 27 19:02:24 2018 +0100,
but with different content
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/man/CRYPTO_set_ex_data.3 | 70 |
1 files changed, 13 insertions, 57 deletions
diff --git a/src/lib/libcrypto/man/CRYPTO_set_ex_data.3 b/src/lib/libcrypto/man/CRYPTO_set_ex_data.3 index 9de936d20a..ca5080dfb9 100644 --- a/src/lib/libcrypto/man/CRYPTO_set_ex_data.3 +++ b/src/lib/libcrypto/man/CRYPTO_set_ex_data.3 | |||
@@ -1,53 +1,7 @@ | |||
1 | .\" $OpenBSD: CRYPTO_set_ex_data.3,v 1.9 2018/03/22 16:06:33 schwarze Exp $ | 1 | .\" $OpenBSD: CRYPTO_set_ex_data.3,v 1.10 2018/04/08 01:00:15 schwarze Exp $ |
2 | .\" OpenSSL CRYPTO_get_ex_new_index.pod 35cb565a Nov 19 15:49:30 2015 -0500 | 2 | .\" full merge up to: |
3 | .\" | 3 | .\" OpenSSL CRYPTO_get_ex_new_index 9e183d22 Mar 11 08:56:44 2017 -0500 |
4 | .\" This file was written by Dr. Stephen Henson <steve@openssl.org>. | 4 | .\" selective merge up to: a73d990e Feb 27 19:02:24 2018 +0100 |
5 | .\" Copyright (c) 2000, 2006 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 | .\" OpenSSL | ||
51 | .\" | 5 | .\" |
52 | .\" This file was written by Dr. Stephen Henson <steve@openssl.org> | 6 | .\" This file was written by Dr. Stephen Henson <steve@openssl.org> |
53 | .\" and by Rich Salz <rsalz@akamai.com>. | 7 | .\" and by Rich Salz <rsalz@akamai.com>. |
@@ -98,7 +52,7 @@ | |||
98 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | 52 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED |
99 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. | 53 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. |
100 | .\" | 54 | .\" |
101 | .Dd $Mdocdate: March 22 2018 $ | 55 | .Dd $Mdocdate: April 8 2018 $ |
102 | .Dt CRYPTO_SET_EX_DATA 3 | 56 | .Dt CRYPTO_SET_EX_DATA 3 |
103 | .Os | 57 | .Os |
104 | .Sh NAME | 58 | .Sh NAME |
@@ -177,18 +131,20 @@ Several OpenSSL structures can have application specific data attached | |||
177 | to them, known as "exdata". | 131 | to them, known as "exdata". |
178 | The specific structures are: | 132 | The specific structures are: |
179 | .Bd -literal | 133 | .Bd -literal |
134 | BIO | ||
135 | DH | ||
136 | DSA | ||
137 | ECDH | ||
138 | ECDSA | ||
139 | ENGINE | ||
140 | RSA | ||
180 | SSL | 141 | SSL |
181 | SSL_CTX | 142 | SSL_CTX |
182 | SSL_SESSION | 143 | SSL_SESSION |
144 | UI | ||
183 | X509 | 145 | X509 |
184 | X509_STORE | 146 | X509_STORE |
185 | X509_STORE_CTX | 147 | X509_STORE_CTX |
186 | DH | ||
187 | DSA | ||
188 | RSA | ||
189 | ENGINE | ||
190 | UI | ||
191 | BIO | ||
192 | .Ed | 148 | .Ed |
193 | .Pp | 149 | .Pp |
194 | Each is identified by a | 150 | Each is identified by a |