diff options
-rw-r--r-- | src/lib/libcrypto/man/ASN1_item_d2i.3 | 24 | ||||
-rw-r--r-- | src/lib/libcrypto/man/crypto.3 | 16 |
2 files changed, 5 insertions, 35 deletions
diff --git a/src/lib/libcrypto/man/ASN1_item_d2i.3 b/src/lib/libcrypto/man/ASN1_item_d2i.3 index a95950d749..bc99f4a6da 100644 --- a/src/lib/libcrypto/man/ASN1_item_d2i.3 +++ b/src/lib/libcrypto/man/ASN1_item_d2i.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: ASN1_item_d2i.3,v 1.17 2023/04/28 15:51:18 job Exp $ | 1 | .\" $OpenBSD: ASN1_item_d2i.3,v 1.18 2023/05/01 07:37:45 tb Exp $ |
2 | .\" selective merge up to: | 2 | .\" selective merge up to: |
3 | .\" OpenSSL doc/man3/d2i_X509.pod 256989ce Jun 19 15:00:32 2020 +0200 | 3 | .\" OpenSSL doc/man3/d2i_X509.pod 256989ce Jun 19 15:00:32 2020 +0200 |
4 | .\" | 4 | .\" |
@@ -66,7 +66,7 @@ | |||
66 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | 66 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED |
67 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. | 67 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. |
68 | .\" | 68 | .\" |
69 | .Dd $Mdocdate: April 28 2023 $ | 69 | .Dd $Mdocdate: May 1 2023 $ |
70 | .Dt ASN1_ITEM_D2I 3 | 70 | .Dt ASN1_ITEM_D2I 3 |
71 | .Os | 71 | .Os |
72 | .Sh NAME | 72 | .Sh NAME |
@@ -77,7 +77,6 @@ | |||
77 | .Nm ASN1_item_i2d , | 77 | .Nm ASN1_item_i2d , |
78 | .Nm ASN1_item_i2d_bio , | 78 | .Nm ASN1_item_i2d_bio , |
79 | .Nm ASN1_item_i2d_fp , | 79 | .Nm ASN1_item_i2d_fp , |
80 | .Nm ASN1_item_ndef_i2d , | ||
81 | .Nm i2d_ASN1_TYPE , | 80 | .Nm i2d_ASN1_TYPE , |
82 | .Nm ASN1_item_dup , | 81 | .Nm ASN1_item_dup , |
83 | .Nm ASN1_item_print | 82 | .Nm ASN1_item_print |
@@ -128,12 +127,6 @@ | |||
128 | .Fa "void *val_in" | 127 | .Fa "void *val_in" |
129 | .Fc | 128 | .Fc |
130 | .Ft int | 129 | .Ft int |
131 | .Fo ASN1_item_ndef_i2d | ||
132 | .Fa "ASN1_VALUE *val_in" | ||
133 | .Fa "unsigned char **der_out" | ||
134 | .Fa "const ASN1_ITEM *it" | ||
135 | .Fc | ||
136 | .Ft int | ||
137 | .Fo i2d_ASN1_TYPE | 130 | .Fo i2d_ASN1_TYPE |
138 | .Fa "ASN1_TYPE *val_in" | 131 | .Fa "ASN1_TYPE *val_in" |
139 | .Fa "unsigned char **der_out" | 132 | .Fa "unsigned char **der_out" |
@@ -270,12 +263,6 @@ or | |||
270 | .Vt FILE , | 263 | .Vt FILE , |
271 | respectively. | 264 | respectively. |
272 | .Pp | 265 | .Pp |
273 | .Fn ASN1_item_ndef_i2d | ||
274 | is similar to | ||
275 | .Fn ASN1_item_i2d | ||
276 | except that it encodes using BER rather than DER, | ||
277 | using the indefinite length form where appropriate. | ||
278 | .Pp | ||
279 | .Fn i2d_ASN1_TYPE | 266 | .Fn i2d_ASN1_TYPE |
280 | is similar to | 267 | is similar to |
281 | .Fn ASN1_item_i2d | 268 | .Fn ASN1_item_i2d |
@@ -309,8 +296,7 @@ If an error occurs, | |||
309 | .Dv NULL | 296 | .Dv NULL |
310 | is returned. | 297 | is returned. |
311 | .Pp | 298 | .Pp |
312 | .Fn ASN1_item_i2d , | 299 | .Fn ASN1_item_i2d |
313 | .Fn ASN1_item_ndef_i2d , | ||
314 | and | 300 | and |
315 | .Fn i2d_ASN1_TYPE | 301 | .Fn i2d_ASN1_TYPE |
316 | return the number of bytes written | 302 | return the number of bytes written |
@@ -403,10 +389,6 @@ and | |||
403 | first appeared in OpenSSL 0.9.7 and have been available since | 389 | first appeared in OpenSSL 0.9.7 and have been available since |
404 | .Ox 3.2 . | 390 | .Ox 3.2 . |
405 | .Pp | 391 | .Pp |
406 | .Fn ASN1_item_ndef_i2d | ||
407 | first appeared in OpenSSL 0.9.8 and has been available since | ||
408 | .Ox 4.5 . | ||
409 | .Pp | ||
410 | .Fn ASN1_item_print | 392 | .Fn ASN1_item_print |
411 | first appeared in OpenSSL 1.0.0 and has been available since | 393 | first appeared in OpenSSL 1.0.0 and has been available since |
412 | .Ox 4.9 . | 394 | .Ox 4.9 . |
diff --git a/src/lib/libcrypto/man/crypto.3 b/src/lib/libcrypto/man/crypto.3 index f809347a6b..e63c1a78df 100644 --- a/src/lib/libcrypto/man/crypto.3 +++ b/src/lib/libcrypto/man/crypto.3 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: crypto.3,v 1.28 2022/02/04 00:55:52 tb Exp $ | 1 | .\" $OpenBSD: crypto.3,v 1.29 2023/05/01 07:37:45 tb Exp $ |
2 | .\" OpenSSL a9c85cea Nov 11 09:33:55 2016 +0100 | 2 | .\" OpenSSL a9c85cea Nov 11 09:33:55 2016 +0100 |
3 | .\" | 3 | .\" |
4 | .\" This file is a derived work. | 4 | .\" This file is a derived work. |
@@ -66,7 +66,7 @@ | |||
66 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | 66 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED |
67 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. | 67 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. |
68 | .\" | 68 | .\" |
69 | .Dd $Mdocdate: February 4 2022 $ | 69 | .Dd $Mdocdate: May 1 2023 $ |
70 | .Dt CRYPTO 3 | 70 | .Dt CRYPTO 3 |
71 | .Os | 71 | .Os |
72 | .Sh NAME | 72 | .Sh NAME |
@@ -337,18 +337,6 @@ in the same sense. | |||
337 | See also the | 337 | See also the |
338 | .Dq cb | 338 | .Dq cb |
339 | entry in the present list. | 339 | entry in the present list. |
340 | .It ndef | ||
341 | indefinite length form: | ||
342 | The function encodes according to ASN.1 basic encoding rules (BER) | ||
343 | using the indefinite length form. | ||
344 | Even if the function name also includes | ||
345 | .Dq i2d , | ||
346 | the output does not conform to ASN.1 distinguished encoding rules (DER). | ||
347 | See | ||
348 | .Xr ASN1_item_ndef_i2d 3 . | ||
349 | Some function names contain the all caps version | ||
350 | .Dq NDEF | ||
351 | with the same meaning. | ||
352 | .It nid | 340 | .It nid |
353 | numerical identifier: | 341 | numerical identifier: |
354 | A non-standard, LibreSSL-specific | 342 | A non-standard, LibreSSL-specific |