diff options
author | schwarze <> | 2018-02-24 20:57:49 +0000 |
---|---|---|
committer | schwarze <> | 2018-02-24 20:57:49 +0000 |
commit | fa066c25d42793344e20c2d5ca7b5374e9e11217 (patch) | |
tree | 1962573df558e8f48b587466baf1925df8cb575a | |
parent | 6cd36d6d0bf166b15954feedef6b113f98a614c1 (diff) | |
download | openbsd-fa066c25d42793344e20c2d5ca7b5374e9e11217.tar.gz openbsd-fa066c25d42793344e20c2d5ca7b5374e9e11217.tar.bz2 openbsd-fa066c25d42793344e20c2d5ca7b5374e9e11217.zip |
In x509.h rev. 1.33 2018/02/22 16:47:50, jsing@ provided
X509_REVOKED_get0_extensions(3) and in rev. 1.36 2018/02/22 16:58:45
X509_CRL_get0_extensions(3). Merge the documentation from OpenSSL
and fix a few minor typos while here.
-rw-r--r-- | src/lib/libcrypto/man/X509V3_get_d2i.3 | 43 |
1 files changed, 31 insertions, 12 deletions
diff --git a/src/lib/libcrypto/man/X509V3_get_d2i.3 b/src/lib/libcrypto/man/X509V3_get_d2i.3 index b28b84089c..f21471b00c 100644 --- a/src/lib/libcrypto/man/X509V3_get_d2i.3 +++ b/src/lib/libcrypto/man/X509V3_get_d2i.3 | |||
@@ -1,5 +1,5 @@ | |||
1 | .\" $OpenBSD: X509V3_get_d2i.3,v 1.7 2018/02/19 07:59:23 schwarze Exp $ | 1 | .\" $OpenBSD: X509V3_get_d2i.3,v 1.8 2018/02/24 20:57:49 schwarze Exp $ |
2 | .\" full merge up to: OpenSSL 047dd81e Jul 4 23:03:17 2014 +0100 | 2 | .\" full merge up to: OpenSSL ff7fbfd5 Nov 2 11:52:01 2015 +0000 |
3 | .\" selective merge up to: OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400 | 3 | .\" selective merge up to: OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400 |
4 | .\" | 4 | .\" |
5 | .\" This file was written by Dr. Stephen Henson <steve@openssl.org>. | 5 | .\" This file was written by Dr. Stephen Henson <steve@openssl.org>. |
@@ -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: February 19 2018 $ | 52 | .Dd $Mdocdate: February 24 2018 $ |
53 | .Dt X509V3_GET_D2I 3 | 53 | .Dt X509V3_GET_D2I 3 |
54 | .Os | 54 | .Os |
55 | .Sh NAME | 55 | .Sh NAME |
@@ -63,7 +63,9 @@ | |||
63 | .Nm X509_CRL_add1_ext_i2d , | 63 | .Nm X509_CRL_add1_ext_i2d , |
64 | .Nm X509_REVOKED_get_ext_d2i , | 64 | .Nm X509_REVOKED_get_ext_d2i , |
65 | .Nm X509_REVOKED_add1_ext_i2d , | 65 | .Nm X509_REVOKED_add1_ext_i2d , |
66 | .Nm X509_get0_extensions | 66 | .Nm X509_get0_extensions , |
67 | .Nm X509_CRL_get0_extensions , | ||
68 | .Nm X509_REVOKED_get0_extensions | ||
67 | .Nd X509 extension decode and encode functions | 69 | .Nd X509 extension decode and encode functions |
68 | .Sh SYNOPSIS | 70 | .Sh SYNOPSIS |
69 | .In openssl/x509v3.h | 71 | .In openssl/x509v3.h |
@@ -137,10 +139,18 @@ | |||
137 | .Fa "int crit" | 139 | .Fa "int crit" |
138 | .Fa "unsigned long flags" | 140 | .Fa "unsigned long flags" |
139 | .Fc | 141 | .Fc |
140 | .Ft const STACK_OF(X509_EXTENSION) | 142 | .Ft const STACK_OF(X509_EXTENSION) * |
141 | .Fo X509_get0_extensions | 143 | .Fo X509_get0_extensions |
142 | .Fa "const X509 *x" | 144 | .Fa "const X509 *x" |
143 | .Fc | 145 | .Fc |
146 | .Ft const STACK_OF(X509_EXTENSION) * | ||
147 | .Fo X509_CRL_get0_extensions | ||
148 | .Fa "const X509_CRL *crl" | ||
149 | .Fc | ||
150 | .Ft const STACK_OF(X509_EXTENSION) * | ||
151 | .Fo X509_REVOKED_get0_extensions | ||
152 | .Fa "const X509_REVOKED *r" | ||
153 | .Fc | ||
144 | .Sh DESCRIPTION | 154 | .Sh DESCRIPTION |
145 | .Fn X509V3_get_d2i | 155 | .Fn X509V3_get_d2i |
146 | looks for an extension with OID | 156 | looks for an extension with OID |
@@ -210,7 +220,7 @@ operate on the extensions of certificate | |||
210 | and are otherwise identical to | 220 | and are otherwise identical to |
211 | .Fn X509V3_get_d2i | 221 | .Fn X509V3_get_d2i |
212 | and | 222 | and |
213 | .Fn X509V3_add1_i2d 3 . | 223 | .Fn X509V3_add1_i2d . |
214 | .Pp | 224 | .Pp |
215 | .Fn X509_CRL_get_ext_d2i | 225 | .Fn X509_CRL_get_ext_d2i |
216 | and | 226 | and |
@@ -220,7 +230,7 @@ operate on the extensions of CRL | |||
220 | and are otherwise identical to | 230 | and are otherwise identical to |
221 | .Fn X509V3_get_d2i | 231 | .Fn X509V3_get_d2i |
222 | and | 232 | and |
223 | .Fn X509V3_add1_i2d 3 . | 233 | .Fn X509V3_add1_i2d . |
224 | .Pp | 234 | .Pp |
225 | .Fn X509_REVOKED_get_ext_d2i | 235 | .Fn X509_REVOKED_get_ext_d2i |
226 | and | 236 | and |
@@ -232,10 +242,14 @@ structure | |||
232 | (i.e. for CRL entry extensions), and are otherwise identical to | 242 | (i.e. for CRL entry extensions), and are otherwise identical to |
233 | .Fn X509V3_get_d2i | 243 | .Fn X509V3_get_d2i |
234 | and | 244 | and |
235 | .Fn X509V3_add1_i2d 3 . | 245 | .Fn X509V3_add1_i2d . |
236 | .Pp | 246 | .Pp |
237 | .Fn X509_get0_extensions | 247 | .Fn X509_get0_extensions , |
238 | returns a stack of all the extensions of a certificate. | 248 | .Fn X509_CRL_get0_extensions , |
249 | and | ||
250 | .Fn X509_REVOKED_get0_extensions | ||
251 | return a stack of all the extensions of a certificate, a CRL, | ||
252 | or a CRL entry, respectively. | ||
239 | .Pp | 253 | .Pp |
240 | In almost all cases an extension can occur at most once and multiple | 254 | In almost all cases an extension can occur at most once and multiple |
241 | occurrences is an error. | 255 | occurrences is an error. |
@@ -373,8 +387,13 @@ returns 1 if the operation is successful, 0 if it fails due to a | |||
373 | non-fatal error (extension not found, already exists, cannot be encoded), | 387 | non-fatal error (extension not found, already exists, cannot be encoded), |
374 | or -1 due to a fatal error such as a memory allocation failure. | 388 | or -1 due to a fatal error such as a memory allocation failure. |
375 | .Pp | 389 | .Pp |
376 | .Fn X509_get0_extensions | 390 | .Fn X509_get0_extensions , |
377 | returns a stack of extensions. | 391 | .Fn X509_CRL_get0_extensions , |
392 | and | ||
393 | .Fn X509_REVOKED_get0_extensions | ||
394 | return a stack of extensions, or | ||
395 | .Dv NULL | ||
396 | if no extensions are present. | ||
378 | .Sh SEE ALSO | 397 | .Sh SEE ALSO |
379 | .Xr d2i_X509 3 , | 398 | .Xr d2i_X509 3 , |
380 | .Xr d2i_X509_EXTENSION 3 , | 399 | .Xr d2i_X509_EXTENSION 3 , |