diff options
author | schwarze <> | 2018-02-25 22:52:48 +0000 |
---|---|---|
committer | schwarze <> | 2018-02-25 22:52:48 +0000 |
commit | b7e9ca652e283beea6335188d22d1480dfe65a7c (patch) | |
tree | 0af305d7f169971e885cd26b3fb9a2aabe97cc9c /src | |
parent | a2e0ddbb2e8e139d15a2c916cedaebb4ac59aed2 (diff) | |
download | openbsd-b7e9ca652e283beea6335188d22d1480dfe65a7c.tar.gz openbsd-b7e9ca652e283beea6335188d22d1480dfe65a7c.tar.bz2 openbsd-b7e9ca652e283beea6335188d22d1480dfe65a7c.zip |
In x509_vfy.h rev. 1.24 2018/02/22 17:19:31, jsing@ provided
X509_STORE_set_ex_data(3) and X509_STORE_get_ex_data(3).
Document them.
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/man/RSA_get_ex_new_index.3 | 10 | ||||
-rw-r--r-- | src/lib/libcrypto/man/X509_STORE_set1_param.3 | 36 |
2 files changed, 40 insertions, 6 deletions
diff --git a/src/lib/libcrypto/man/RSA_get_ex_new_index.3 b/src/lib/libcrypto/man/RSA_get_ex_new_index.3 index a5331e6ab1..bc2cf62ae4 100644 --- a/src/lib/libcrypto/man/RSA_get_ex_new_index.3 +++ b/src/lib/libcrypto/man/RSA_get_ex_new_index.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: RSA_get_ex_new_index.3,v 1.7 2017/08/01 14:57:03 schwarze Exp $ | 1 | .\" $OpenBSD: RSA_get_ex_new_index.3,v 1.8 2018/02/25 22:52:48 schwarze Exp $ |
2 | .\" OpenSSL 35cb565a Nov 19 15:49:30 2015 -0500 | 2 | .\" OpenSSL 35cb565a Nov 19 15:49:30 2015 -0500 |
3 | .\" | 3 | .\" |
4 | .\" This file was written by Ulf Moeller <ulf@openssl.org> and | 4 | .\" This file was written by Ulf Moeller <ulf@openssl.org> and |
@@ -49,7 +49,7 @@ | |||
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: August 1 2017 $ | 52 | .Dd $Mdocdate: February 25 2018 $ |
53 | .Dt RSA_GET_EX_NEW_INDEX 3 | 53 | .Dt RSA_GET_EX_NEW_INDEX 3 |
54 | .Os | 54 | .Os |
55 | .Sh NAME | 55 | .Sh NAME |
@@ -265,7 +265,11 @@ On failure an error code can be obtained from | |||
265 | .Xr DH_set_ex_data 3 , | 265 | .Xr DH_set_ex_data 3 , |
266 | .Xr DSA_set_ex_data 3 , | 266 | .Xr DSA_set_ex_data 3 , |
267 | .Xr RSA_new 3 , | 267 | .Xr RSA_new 3 , |
268 | .Xr X509_STORE_CTX_set_ex_data 3 | 268 | .Xr SSL_CTX_set_ex_data 3 , |
269 | .Xr SSL_SESSION_set_ex_data 3 , | ||
270 | .Xr SSL_set_ex_data 3 , | ||
271 | .Xr X509_STORE_CTX_set_ex_data 3 , | ||
272 | .Xr X509_STORE_set_ex_data 3 | ||
269 | .Sh HISTORY | 273 | .Sh HISTORY |
270 | .Fn RSA_get_ex_new_index , | 274 | .Fn RSA_get_ex_new_index , |
271 | .Fn RSA_set_ex_data , | 275 | .Fn RSA_set_ex_data , |
diff --git a/src/lib/libcrypto/man/X509_STORE_set1_param.3 b/src/lib/libcrypto/man/X509_STORE_set1_param.3 index adbf8f5a1e..5905043466 100644 --- a/src/lib/libcrypto/man/X509_STORE_set1_param.3 +++ b/src/lib/libcrypto/man/X509_STORE_set1_param.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: X509_STORE_set1_param.3,v 1.5 2018/02/25 22:24:18 schwarze Exp $ | 1 | .\" $OpenBSD: X509_STORE_set1_param.3,v 1.6 2018/02/25 22:52:48 schwarze Exp $ |
2 | .\" content checked up to: | 2 | .\" content checked up to: |
3 | .\" OpenSSL man3/X509_STORE_get0_param e90fc053 Jul 15 09:39:45 2017 -0400 | 3 | .\" OpenSSL man3/X509_STORE_get0_param e90fc053 Jul 15 09:39:45 2017 -0400 |
4 | .\" | 4 | .\" |
@@ -27,7 +27,9 @@ | |||
27 | .Nm X509_STORE_set_depth , | 27 | .Nm X509_STORE_set_depth , |
28 | .Nm X509_STORE_add_cert , | 28 | .Nm X509_STORE_add_cert , |
29 | .Nm X509_STORE_add_crl , | 29 | .Nm X509_STORE_add_crl , |
30 | .Nm X509_STORE_get0_objects | 30 | .Nm X509_STORE_get0_objects , |
31 | .Nm X509_STORE_set_ex_data , | ||
32 | .Nm X509_STORE_get_ex_data | ||
31 | .Nd get and set X509_STORE data | 33 | .Nd get and set X509_STORE data |
32 | .Sh SYNOPSIS | 34 | .Sh SYNOPSIS |
33 | .In openssl/x509_vfy.h | 35 | .In openssl/x509_vfy.h |
@@ -70,6 +72,17 @@ | |||
70 | .Fo X509_STORE_get0_objects | 72 | .Fo X509_STORE_get0_objects |
71 | .Fa "X509_STORE *store" | 73 | .Fa "X509_STORE *store" |
72 | .Fc | 74 | .Fc |
75 | .Ft int | ||
76 | .Fo X509_STORE_set_ex_data | ||
77 | .Fa "X509_STORE *store" | ||
78 | .Fa "int idx" | ||
79 | .Fa "void *arg" | ||
80 | .Fc | ||
81 | .Ft void * | ||
82 | .Fo X509_STORE_get_ex_data | ||
83 | .Fa "X509_STORE *store" | ||
84 | .Fa "int idx" | ||
85 | .Fc | ||
73 | .Sh DESCRIPTION | 86 | .Sh DESCRIPTION |
74 | .Fn X509_STORE_set1_param | 87 | .Fn X509_STORE_set1_param |
75 | copies the verification parameters from | 88 | copies the verification parameters from |
@@ -101,11 +114,23 @@ or the certificate revocation list | |||
101 | to the | 114 | to the |
102 | .Fa store , | 115 | .Fa store , |
103 | increasing its reference count by 1 in case of success. | 116 | increasing its reference count by 1 in case of success. |
117 | .Pp | ||
118 | .Fn X509_STORE_set_ex_data | ||
119 | and | ||
120 | .Fn X509_STORE_get_ex_data | ||
121 | handle application specific data in | ||
122 | .Vt X509_STORE | ||
123 | objects. | ||
124 | Their usage is identical to that of | ||
125 | .Xr RSA_set_ex_data 3 | ||
126 | and | ||
127 | .Xr RSA_get_ex_data 3 . | ||
104 | .Sh RETURN VALUES | 128 | .Sh RETURN VALUES |
105 | .Fn X509_STORE_set1_param , | 129 | .Fn X509_STORE_set1_param , |
106 | .Fn X509_STORE_set_purpose , | 130 | .Fn X509_STORE_set_purpose , |
131 | .Fn X509_STORE_set_trust , | ||
107 | and | 132 | and |
108 | .Fn X509_STORE_set_trust | 133 | .Fn X509_STORE_set_ex_data |
109 | return 1 for success or 0 for failure. | 134 | return 1 for success or 0 for failure. |
110 | .Pp | 135 | .Pp |
111 | .Fn X509_STORE_set_flags | 136 | .Fn X509_STORE_set_flags |
@@ -136,6 +161,11 @@ returns an internal pointer to the stack of certificates, revocation lists, | |||
136 | and private keys contained in the | 161 | and private keys contained in the |
137 | .Fa store . | 162 | .Fa store . |
138 | The returned pointer must not be freed by the calling application. | 163 | The returned pointer must not be freed by the calling application. |
164 | .Pp | ||
165 | .Fn X509_STORE_get_ex_data | ||
166 | returns the application data or | ||
167 | .Dv NULL | ||
168 | on failure. | ||
139 | .Sh SEE ALSO | 169 | .Sh SEE ALSO |
140 | .Xr SSL_set1_param 3 , | 170 | .Xr SSL_set1_param 3 , |
141 | .Xr X509_OBJECT_get0_X509 3 , | 171 | .Xr X509_OBJECT_get0_X509 3 , |