From d005c040eb015cb7a531a0fc79d93c52f0a6d3fa Mon Sep 17 00:00:00 2001 From: jmc <> Date: Thu, 8 Dec 2016 20:22:08 +0000 Subject: various cleanup; --- src/lib/libcrypto/man/d2i_ASN1_OBJECT.3 | 11 +++++------ src/lib/libcrypto/man/d2i_DHparams.3 | 7 +++---- src/lib/libcrypto/man/d2i_DSAPublicKey.3 | 14 +++++++------- src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3 | 12 +++++++----- src/lib/libcrypto/man/d2i_PrivateKey.3 | 8 ++++---- src/lib/libcrypto/man/d2i_RSAPublicKey.3 | 8 ++++---- src/lib/libcrypto/man/d2i_X509.3 | 18 ++++++++++-------- src/lib/libcrypto/man/d2i_X509_ALGOR.3 | 7 +++---- src/lib/libcrypto/man/d2i_X509_CRL.3 | 7 +++---- src/lib/libcrypto/man/d2i_X509_NAME.3 | 11 +++++------ src/lib/libcrypto/man/d2i_X509_REQ.3 | 7 +++---- src/lib/libcrypto/man/d2i_X509_SIG.3 | 9 ++++----- 12 files changed, 58 insertions(+), 61 deletions(-) (limited to 'src/lib') diff --git a/src/lib/libcrypto/man/d2i_ASN1_OBJECT.3 b/src/lib/libcrypto/man/d2i_ASN1_OBJECT.3 index 48ecd89db6..77e6848394 100644 --- a/src/lib/libcrypto/man/d2i_ASN1_OBJECT.3 +++ b/src/lib/libcrypto/man/d2i_ASN1_OBJECT.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: d2i_ASN1_OBJECT.3,v 1.3 2016/12/05 20:32:19 schwarze Exp $ +.\" $OpenBSD: d2i_ASN1_OBJECT.3,v 1.4 2016/12/08 20:22:08 jmc Exp $ .\" OpenSSL 05ea606a May 20 20:52:46 2016 -0400 .\" .\" This file was written by Dr. Stephen Henson . @@ -48,13 +48,13 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: December 5 2016 $ +.Dd $Mdocdate: December 8 2016 $ .Dt D2I_ASN1_OBJECT 3 .Os .Sh NAME .Nm d2i_ASN1_OBJECT , .Nm i2d_ASN1_OBJECT -.Nd ASN1 OBJECT IDENTIFIER functions +.Nd ASN.1 OBJECT IDENTIFIER functions .Sh SYNOPSIS .In openssl/objects.h .Ft ASN1_OBJECT * @@ -69,9 +69,8 @@ .Fa "unsigned char **pp" .Fc .Sh DESCRIPTION -These functions decode and encode an ASN1 OBJECT IDENTIFIER. -.Pp -Otherwise these behave in a similar way to +These functions decode and encode an ASN.1 OBJECT IDENTIFIER. +They otherwise behave in a similar way to .Xr d2i_X509 3 and .Xr i2d_X509 3 . diff --git a/src/lib/libcrypto/man/d2i_DHparams.3 b/src/lib/libcrypto/man/d2i_DHparams.3 index cbf32c8c6e..b1f75fafae 100644 --- a/src/lib/libcrypto/man/d2i_DHparams.3 +++ b/src/lib/libcrypto/man/d2i_DHparams.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: d2i_DHparams.3,v 1.3 2016/12/05 20:32:19 schwarze Exp $ +.\" $OpenBSD: d2i_DHparams.3,v 1.4 2016/12/08 20:22:08 jmc Exp $ .\" OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400 .\" .\" This file was written by Ulf Moeller and @@ -49,7 +49,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: December 5 2016 $ +.Dd $Mdocdate: December 8 2016 $ .Dt D2I_DHPARAMS 3 .Os .Sh NAME @@ -72,8 +72,7 @@ .Sh DESCRIPTION These functions decode and encode PKCS#3 DH parameters using the DHparameter structure described in PKCS#3. -.Pp -Otherwise these behave in a way similar to +They otherwise behave in a way similar to .Xr d2i_X509 3 and .Xr i2d_X509 3 . diff --git a/src/lib/libcrypto/man/d2i_DSAPublicKey.3 b/src/lib/libcrypto/man/d2i_DSAPublicKey.3 index 423beb123a..6474e9a46c 100644 --- a/src/lib/libcrypto/man/d2i_DSAPublicKey.3 +++ b/src/lib/libcrypto/man/d2i_DSAPublicKey.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: d2i_DSAPublicKey.3,v 1.3 2016/12/05 20:36:19 schwarze Exp $ +.\" $OpenBSD: d2i_DSAPublicKey.3,v 1.4 2016/12/08 20:22:08 jmc Exp $ .\" OpenSSL bb9ad09e Jun 6 00:43:05 2016 -0400 .\" .\" This file was written by Dr. Stephen Henson . @@ -49,20 +49,20 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: December 5 2016 $ +.Dd $Mdocdate: December 8 2016 $ .Dt D2I_DSAPUBLICKEY 3 .Os .Sh NAME .Nm d2i_DSAPublicKey , .Nm i2d_DSAPublicKey , -.Nm d2i_DSAPrivateKey , -.Nm i2d_DSAPrivateKey , .Nm d2i_DSA_PUBKEY , .Nm i2d_DSA_PUBKEY , .Nm d2i_DSA_PUBKEY_bio , .Nm d2i_DSA_PUBKEY_fp , .Nm i2d_DSA_PUBKEY_bio , .Nm i2d_DSA_PUBKEY_fp , +.Nm d2i_DSAPrivateKey , +.Nm i2d_DSAPrivateKey , .Nm d2i_DSAparams , .Nm i2d_DSAparams , .Nm d2i_DSA_SIG , @@ -183,14 +183,14 @@ and .Fn i2d_DSAparams decode and encode the DSA parameters using a .Sy Dss-Parms -structure as defined in RFC2459. +structure as defined in RFC 2459. .Pp .Fn d2i_DSA_SIG and .Fn i2d_DSA_SIG decode and encode a DSA signature using a .Sy Dss-Sig-Value -structure as defined in RFC2459. +structure as defined in RFC 2459. .Pp The usage of all of these functions is similar to .Xr d2i_X509 3 @@ -213,7 +213,7 @@ functions when encoding public keys because they use a standard format. .Pp The .Fn *_DSAPublicKey -functions use an non-standard format. +functions use a non-standard format. The actual data encoded depends on the value of .Fa a->write_params . If diff --git a/src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3 b/src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3 index eb9cf563d8..76295cdde1 100644 --- a/src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3 +++ b/src/lib/libcrypto/man/d2i_PKCS8PrivateKey_bio.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: d2i_PKCS8PrivateKey_bio.3,v 1.4 2016/12/06 14:45:08 schwarze Exp $ +.\" $OpenBSD: d2i_PKCS8PrivateKey_bio.3,v 1.5 2016/12/08 20:22:08 jmc Exp $ .\" OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400 .\" .\" This file was written by Dr. Stephen Henson . @@ -48,7 +48,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: December 6 2016 $ +.Dd $Mdocdate: December 8 2016 $ .Dt D2I_PKCS8PRIVATEKEY_BIO 3 .Os .Sh NAME @@ -137,9 +137,11 @@ Currently all the functions use .Vt BIO or .Vt FILE -pointers, there are no functions which work directly on memory: -this can be readily worked around by converting the buffers to -memory BIOs, see +pointers. +There are no functions which work directly on memory, +though this can be readily worked around +by converting the buffers to memory BIOs; +see .Xr BIO_s_mem 3 for details. .Sh SEE ALSO diff --git a/src/lib/libcrypto/man/d2i_PrivateKey.3 b/src/lib/libcrypto/man/d2i_PrivateKey.3 index 73ffa25886..10eb5ebeeb 100644 --- a/src/lib/libcrypto/man/d2i_PrivateKey.3 +++ b/src/lib/libcrypto/man/d2i_PrivateKey.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: d2i_PrivateKey.3,v 1.2 2016/12/06 14:54:55 schwarze Exp $ +.\" $OpenBSD: d2i_PrivateKey.3,v 1.3 2016/12/08 20:22:08 jmc Exp $ .\" OpenSSL b97fdb57 Nov 11 09:33:09 2016 +0100 .\" .\" This file was written by Dr. Stephen Henson . @@ -48,7 +48,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: December 6 2016 $ +.Dd $Mdocdate: December 8 2016 $ .Dt D2I_PRIVATEKEY 3 .Os .Sh NAME @@ -120,7 +120,7 @@ functions; see All these functions use DER format and unencrypted keys. Applications wishing to encrypt or decrypt private keys should use other functions such as -.Xr d2i_PKC8PrivateKey 3 +.Xr d2i_PKCS8PrivateKey_bio 3 instead. .Pp If @@ -151,4 +151,4 @@ an error occurs. The error code can be obtained by calling .Xr ERR_get_error 3 . .Sh SEE ALSO -.Xr d2i_PKCS8PrivateKey 3 +.Xr d2i_PKCS8PrivateKey_bio 3 diff --git a/src/lib/libcrypto/man/d2i_RSAPublicKey.3 b/src/lib/libcrypto/man/d2i_RSAPublicKey.3 index 0ce5f31aa5..73147e10e6 100644 --- a/src/lib/libcrypto/man/d2i_RSAPublicKey.3 +++ b/src/lib/libcrypto/man/d2i_RSAPublicKey.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: d2i_RSAPublicKey.3,v 1.3 2016/12/05 20:36:19 schwarze Exp $ +.\" $OpenBSD: d2i_RSAPublicKey.3,v 1.4 2016/12/08 20:22:08 jmc Exp $ .\" OpenSSL bb9ad09e Jun 6 00:43:05 2016 -0400 .\" .\" This file was written by Ulf Moeller and @@ -50,20 +50,20 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: December 5 2016 $ +.Dd $Mdocdate: December 8 2016 $ .Dt D2I_RSAPUBLICKEY 3 .Os .Sh NAME .Nm d2i_RSAPublicKey , .Nm i2d_RSAPublicKey , -.Nm d2i_RSAPrivateKey , -.Nm i2d_RSAPrivateKey , .Nm d2i_RSA_PUBKEY , .Nm i2d_RSA_PUBKEY , .Nm d2i_RSA_PUBKEY_bio , .Nm d2i_RSA_PUBKEY_fp , .Nm i2d_RSA_PUBKEY_bio , .Nm i2d_RSA_PUBKEY_fp , +.Nm d2i_RSAPrivateKey , +.Nm i2d_RSAPrivateKey , .Nm i2d_Netscape_RSA , .Nm d2i_Netscape_RSA .Nd RSA public and private key encoding functions diff --git a/src/lib/libcrypto/man/d2i_X509.3 b/src/lib/libcrypto/man/d2i_X509.3 index 916fdb8005..7ca3abf2d9 100644 --- a/src/lib/libcrypto/man/d2i_X509.3 +++ b/src/lib/libcrypto/man/d2i_X509.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: d2i_X509.3,v 1.3 2016/12/05 20:39:08 schwarze Exp $ +.\" $OpenBSD: d2i_X509.3,v 1.4 2016/12/08 20:22:08 jmc Exp $ .\" OpenSSL 94480b57 Sep 12 23:34:41 2009 +0000 .\" .\" This file was written by Dr. Stephen Henson . @@ -49,12 +49,14 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: December 5 2016 $ +.Dd $Mdocdate: December 8 2016 $ .Dt D2I_X509 3 .Os .Sh NAME .Nm d2i_X509 , +.Nm d2i_X509_AUX , .Nm i2d_X509 , +.Nm i2d_X509_AUX , .Nm d2i_X509_bio , .Nm d2i_X509_fp , .Nm i2d_X509_bio , @@ -136,7 +138,7 @@ contains a valid .Vt X509 structure and an attempt is made to reuse it. This "reuse" capability is present for historical compatibility, -but its use is strongly discouraged, see the +but its use is strongly discouraged; see the .Sx BUGS and .Sx RETURN VALUES @@ -223,7 +225,7 @@ The letters .Sy i and .Sy d -in for example +in, for example, .Fn i2d_X509 stand for "internal" (that is an internal C structure) and "DER", so that @@ -264,8 +266,8 @@ See the section for some common errors. .Pp The reason for the auto increment behaviour is to reflect a typical -usage of ASN1 functions: after one structure is encoded or decoded, -another will processed after it. +usage of ASN.1 functions: after one structure is encoded or decoded, +another will be processed after it. .Sh RETURN VALUES .Fn d2i_X509 , .Fn d2i_X509_bio , @@ -308,7 +310,7 @@ p = buf; i2d_X509(x, &p); .Ed .Pp -If you are using OpenSSL 0.9.7 or later then this can be simplified to: +Using OpenSSL 0.9.7 or later this can be simplified to: .Bd -literal -offset indent int len; unsigned char *buf; @@ -386,7 +388,7 @@ may well crash. The auto allocation feature (setting .Fa buf to -.Dv NULL +.Dv NULL ) only works on OpenSSL 0.9.7 and later. Attempts to use it on earlier versions will typically cause a segmentation violation. diff --git a/src/lib/libcrypto/man/d2i_X509_ALGOR.3 b/src/lib/libcrypto/man/d2i_X509_ALGOR.3 index e4eab2e883..4e2b02400b 100644 --- a/src/lib/libcrypto/man/d2i_X509_ALGOR.3 +++ b/src/lib/libcrypto/man/d2i_X509_ALGOR.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: d2i_X509_ALGOR.3,v 1.3 2016/12/05 20:32:19 schwarze Exp $ +.\" $OpenBSD: d2i_X509_ALGOR.3,v 1.4 2016/12/08 20:22:08 jmc Exp $ .\" OpenSSL 186bb907 Apr 13 11:05:13 2015 -0700 .\" .\" This file was written by Dr. Stephen Henson . @@ -48,7 +48,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: December 5 2016 $ +.Dd $Mdocdate: December 8 2016 $ .Dt D2I_X509_ALGOR 3 .Os .Sh NAME @@ -74,8 +74,7 @@ These functions decode and encode an structure which is equivalent to the .Sy AlgorithmIdentifier structure. -.Pp -Otherwise these behave in a way similar to +They otherwise behave in a way similar to .Xr d2i_X509 3 and .Xr i2d_X509 3 . diff --git a/src/lib/libcrypto/man/d2i_X509_CRL.3 b/src/lib/libcrypto/man/d2i_X509_CRL.3 index dd1abf4586..1c8ca5c6b9 100644 --- a/src/lib/libcrypto/man/d2i_X509_CRL.3 +++ b/src/lib/libcrypto/man/d2i_X509_CRL.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: d2i_X509_CRL.3,v 1.3 2016/12/05 20:32:19 schwarze Exp $ +.\" $OpenBSD: d2i_X509_CRL.3,v 1.4 2016/12/08 20:22:08 jmc Exp $ .\" OpenSSL bb9ad09e Jun 6 00:43:05 2016 -0400 .\" .\" This file was written by Dr. Stephen Henson . @@ -49,7 +49,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: December 5 2016 $ +.Dd $Mdocdate: December 8 2016 $ .Dt D2I_X509_CRL 3 .Os .Sh NAME @@ -96,8 +96,7 @@ .Sh DESCRIPTION These functions decode and encode an X509 CRL (certificate revocation list). -.Pp -Otherwise the functions behave in a way similar to +They otherwise behave in a way similar to .Xr d2i_X509 3 and .Xr i2d_X509 3 . diff --git a/src/lib/libcrypto/man/d2i_X509_NAME.3 b/src/lib/libcrypto/man/d2i_X509_NAME.3 index 701c4e31fa..2817a7f3ce 100644 --- a/src/lib/libcrypto/man/d2i_X509_NAME.3 +++ b/src/lib/libcrypto/man/d2i_X509_NAME.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: d2i_X509_NAME.3,v 1.3 2016/12/05 20:32:19 schwarze Exp $ +.\" $OpenBSD: d2i_X509_NAME.3,v 1.4 2016/12/08 20:22:08 jmc Exp $ .\" OpenSSL d900a015 Oct 8 14:40:42 2015 +0200 .\" .\" This file was written by Dr. Stephen Henson . @@ -48,7 +48,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: December 5 2016 $ +.Dd $Mdocdate: December 8 2016 $ .Dt D2I_X509_NAME 3 .Os .Sh NAME @@ -71,12 +71,11 @@ .Sh DESCRIPTION These functions decode and encode an .Vt X509_NAME -structure which is the same as the +structure, which is the same as the .Sy Name -type defined in RFC2459 (and elsewhere) and used for example in +type defined in RFC 2459 (and elsewhere) and used, for example, in certificate subject and issuer names. -.Pp -Otherwise the functions behave in a way similar to +They otherwise behave in a way similar to .Xr d2i_X509 3 and .Xr i2d_X509 3 . diff --git a/src/lib/libcrypto/man/d2i_X509_REQ.3 b/src/lib/libcrypto/man/d2i_X509_REQ.3 index 26a8fada2c..6c4a61985e 100644 --- a/src/lib/libcrypto/man/d2i_X509_REQ.3 +++ b/src/lib/libcrypto/man/d2i_X509_REQ.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: d2i_X509_REQ.3,v 1.3 2016/12/05 20:32:19 schwarze Exp $ +.\" $OpenBSD: d2i_X509_REQ.3,v 1.4 2016/12/08 20:22:08 jmc Exp $ .\" OpenSSL bb9ad09e Jun 6 00:43:05 2016 -0400 .\" .\" This file was written by Dr. Stephen Henson . @@ -49,7 +49,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: December 5 2016 $ +.Dd $Mdocdate: December 8 2016 $ .Dt D2I_X509_REQ 3 .Os .Sh NAME @@ -95,8 +95,7 @@ .Fc .Sh DESCRIPTION These functions decode and encode a PKCS#10 certificate request. -.Pp -Otherwise these behave in a way similar to +They otherwise behave in a way similar to .Xr d2i_X509 3 and .Xr i2d_X509 3 . diff --git a/src/lib/libcrypto/man/d2i_X509_SIG.3 b/src/lib/libcrypto/man/d2i_X509_SIG.3 index 8c107a8e88..8466ccfe7f 100644 --- a/src/lib/libcrypto/man/d2i_X509_SIG.3 +++ b/src/lib/libcrypto/man/d2i_X509_SIG.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: d2i_X509_SIG.3,v 1.3 2016/12/05 20:32:19 schwarze Exp $ +.\" $OpenBSD: d2i_X509_SIG.3,v 1.4 2016/12/08 20:22:08 jmc Exp $ .\" OpenSSL 9b86974e Aug 17 15:21:33 2015 -0400 .\" .\" This file was written by Dr. Stephen Henson . @@ -48,7 +48,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED .\" OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: December 5 2016 $ +.Dd $Mdocdate: December 8 2016 $ .Dt D2I_X509_SIG 3 .Os .Sh NAME @@ -71,11 +71,10 @@ .Sh DESCRIPTION These functions decode and encode an .Vt X509_SIG -structure which is equivalent to the +structure, which is equivalent to the .Sy DigestInfo structure defined in PKCS#1 and PKCS#7. -.Pp -Otherwise these behave in a way similar to +They otherwise behave in a way similar to .Xr d2i_X509 3 and .Xr i2d_X509 3 . -- cgit v1.2.3-55-g6feb