summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschwarze <>2016-12-26 19:15:47 +0000
committerschwarze <>2016-12-26 19:15:47 +0000
commitef877016c0e6162587580fcb53f884e257c71534 (patch)
tree5af46557d804ee7d8e3b15eda0cc2314b7d1eb83
parentc25bad99528b9a76ab7fcb48adfe7179287ca113 (diff)
downloadopenbsd-ef877016c0e6162587580fcb53f884e257c71534.tar.gz
openbsd-ef877016c0e6162587580fcb53f884e257c71534.tar.bz2
openbsd-ef877016c0e6162587580fcb53f884e257c71534.zip
also document the weird i2d_PKCS7_NDEF(3)
listed in <openssl/pkcs7.h> and OpenSSL doc/man3/d2i_X509.pod
-rw-r--r--src/lib/libcrypto/man/d2i_PKCS7.315
1 files changed, 14 insertions, 1 deletions
diff --git a/src/lib/libcrypto/man/d2i_PKCS7.3 b/src/lib/libcrypto/man/d2i_PKCS7.3
index a9bc4ba381..e366642cca 100644
--- a/src/lib/libcrypto/man/d2i_PKCS7.3
+++ b/src/lib/libcrypto/man/d2i_PKCS7.3
@@ -1,4 +1,4 @@
1.\" $OpenBSD: d2i_PKCS7.3,v 1.1 2016/12/26 18:52:51 schwarze Exp $ 1.\" $OpenBSD: d2i_PKCS7.3,v 1.2 2016/12/26 19:15:47 schwarze Exp $
2.\" 2.\"
3.\" Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org> 3.\" Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
4.\" 4.\"
@@ -24,6 +24,7 @@
24.Nm i2d_PKCS7_bio , 24.Nm i2d_PKCS7_bio ,
25.Nm d2i_PKCS7_fp , 25.Nm d2i_PKCS7_fp ,
26.Nm i2d_PKCS7_fp , 26.Nm i2d_PKCS7_fp ,
27.Nm i2d_PKCS7_NDEF ,
27.Nm d2i_PKCS7_DIGEST , 28.Nm d2i_PKCS7_DIGEST ,
28.Nm i2d_PKCS7_DIGEST , 29.Nm i2d_PKCS7_DIGEST ,
29.Nm d2i_PKCS7_ENCRYPT , 30.Nm d2i_PKCS7_ENCRYPT ,
@@ -77,6 +78,11 @@
77.Fa "FILE *out_fp" 78.Fa "FILE *out_fp"
78.Fa "PKCS7 *val_in" 79.Fa "PKCS7 *val_in"
79.Fc 80.Fc
81.Ft int
82.Fo i2d_PKCS7_NDEF
83.Fa "PKCS7 *val_in"
84.Fa "unsigned char **ber_out"
85.Fc
80.Ft PKCS7_DIGEST * 86.Ft PKCS7_DIGEST *
81.Fo d2i_PKCS7_DIGEST 87.Fo d2i_PKCS7_DIGEST
82.Fa "PKCS7_DIGEST **val_out" 88.Fa "PKCS7_DIGEST **val_out"
@@ -198,6 +204,12 @@ or
198.Vt FILE 204.Vt FILE
199pointer. 205pointer.
200.Pp 206.Pp
207.Fn i2d_PKCS7_NDEF
208is similar to
209.Fn i2d_PKCS7
210except that it encodes using BER rather than DER, using the indefinite
211length form where appropriate.
212.Pp
201.Fn d2i_PKCS7_DIGEST 213.Fn d2i_PKCS7_DIGEST
202and 214and
203.Fn i2d_PKCS7_DIGEST 215.Fn i2d_PKCS7_DIGEST
@@ -286,6 +298,7 @@ return an object of the respective type or
286if an error occurs. 298if an error occurs.
287.Pp 299.Pp
288.Fn i2d_PKCS7 , 300.Fn i2d_PKCS7 ,
301.Fn i2d_PKCS7_NDEF ,
289.Fn i2d_PKCS7_DIGEST , 302.Fn i2d_PKCS7_DIGEST ,
290.Fn i2d_PKCS7_ENCRYPT , 303.Fn i2d_PKCS7_ENCRYPT ,
291.Fn i2d_PKCS7_ENC_CONTENT , 304.Fn i2d_PKCS7_ENC_CONTENT ,