summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmc <jmc@openbsd.org>2016-12-08 21:48:50 +0000
committerjmc <jmc@openbsd.org>2016-12-08 21:48:50 +0000
commita957ca1fd7121f9ddcd26bc95f936b5ffa85dfa8 (patch)
tree0c4c0b0b0c991b9f0f5f443a9991ed01f5c3444f
parentvarious cleanup; (diff)
downloadwireguard-openbsd-a957ca1fd7121f9ddcd26bc95f936b5ffa85dfa8.tar.xz
wireguard-openbsd-a957ca1fd7121f9ddcd26bc95f936b5ffa85dfa8.zip
minor cleanup;
-rw-r--r--lib/libcrypto/man/ASN1_STRING_print_ex.36
-rw-r--r--lib/libcrypto/man/des_read_pw.318
-rw-r--r--lib/libcrypto/man/ec.36
-rw-r--r--lib/libcrypto/man/i2d_PKCS7_bio_stream.36
-rw-r--r--lib/libcrypto/man/x509.38
5 files changed, 20 insertions, 24 deletions
diff --git a/lib/libcrypto/man/ASN1_STRING_print_ex.3 b/lib/libcrypto/man/ASN1_STRING_print_ex.3
index f63975c47b4..8b9d4821a0b 100644
--- a/lib/libcrypto/man/ASN1_STRING_print_ex.3
+++ b/lib/libcrypto/man/ASN1_STRING_print_ex.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ASN1_STRING_print_ex.3,v 1.5 2016/11/10 13:06:24 schwarze Exp $
+.\" $OpenBSD: ASN1_STRING_print_ex.3,v 1.6 2016/12/08 21:48:50 jmc Exp $
.\" OpenSSL bb9ad09e Mon 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: November 10 2016 $
+.Dd $Mdocdate: December 8 2016 $
.Dt ASN1_STRING_PRINT_EX 3
.Os
.Sh NAME
@@ -189,7 +189,7 @@ is set, then the complete encoding is dumped
instead (including tag and length octets).
.Pp
.Dv ASN1_STRFLGS_RFC2253
-includes all the flags required by RFC2253.
+includes all the flags required by RFC 2253.
It is equivalent to
.Dv ASN1_STRFLGS_ESC_2253 |
.Dv ASN1_STRFLGS_ESC_CTRL |
diff --git a/lib/libcrypto/man/des_read_pw.3 b/lib/libcrypto/man/des_read_pw.3
index 87410b3c527..1f2fae984e3 100644
--- a/lib/libcrypto/man/des_read_pw.3
+++ b/lib/libcrypto/man/des_read_pw.3
@@ -1,6 +1,6 @@
-.\" $OpenBSD: des_read_pw.3,v 1.3 2016/11/06 15:52:50 jmc Exp $
+.\" $OpenBSD: des_read_pw.3,v 1.4 2016/12/08 21:48:50 jmc Exp $
.\"
-.Dd $Mdocdate: November 6 2016 $
+.Dd $Mdocdate: December 8 2016 $
.Dt DES_READ_PW 3
.Os
.Sh NAME
@@ -8,7 +8,7 @@
.Nm des_read_2passwords ,
.Nm des_read_pw_string ,
.Nm des_read_pw
-.Nd Compatibility user interface functions
+.Nd compatibility user interface functions
.Sh SYNOPSIS
.In openssl/des_old.h
.Ft int
@@ -47,7 +47,7 @@ part of the UI compatibility library.
.Fn des_read_pw
writes the string specified by
.Fa prompt
-to standard output turns echo off and reads an input string from the
+to standard output, turns echo off, and reads an input string from the
terminal.
The string is returned in
.Fa buf ,
@@ -72,9 +72,12 @@ to do the work.
.Fn des_read_pw_string
is a variant of
.Fn des_read_pw
-that provides a buffer for you if
+that provides a buffer if
.Fa verify
is set.
+It is available in the MIT Kerberos library as well,
+and is also available under the name
+.Xr EVP_read_pw_string 3 .
.Pp
.Fn des_read_password
calls
@@ -87,11 +90,6 @@ operates in the same way as
except that it generates two keys by using the
.Xr DES_string_to_2key 3
function.
-.Sh NOTES
-.Fn des_read_pw_string
-is available in the MIT Kerberos library as well, and is also available
-under the name
-.Xr EVP_read_pw_string 3 .
.Sh SEE ALSO
.Xr UI_new 3
.Sh AUTHORS
diff --git a/lib/libcrypto/man/ec.3 b/lib/libcrypto/man/ec.3
index efc6f9ab9e8..b3e0c8697ec 100644
--- a/lib/libcrypto/man/ec.3
+++ b/lib/libcrypto/man/ec.3
@@ -1,6 +1,6 @@
-.\" $OpenBSD: ec.3,v 1.3 2016/11/06 15:57:38 schwarze Exp $
+.\" $OpenBSD: ec.3,v 1.4 2016/12/08 21:48:50 jmc Exp $
.\"
-.Dd $Mdocdate: November 6 2016 $
+.Dd $Mdocdate: December 8 2016 $
.Dt EC 3
.Os
.Sh NAME
@@ -54,7 +54,7 @@ objects are explained in
.Xr EC_POINT_new 3 ,
whilst functions for performing mathematical operations and tests on
.Vt EC_POINT Ns s
-are coverd in
+are covered in
.Xr EC_POINT_add 3 .
.Pp
For working with private and public keys refer to
diff --git a/lib/libcrypto/man/i2d_PKCS7_bio_stream.3 b/lib/libcrypto/man/i2d_PKCS7_bio_stream.3
index 694b320e49f..6e813f2cc3a 100644
--- a/lib/libcrypto/man/i2d_PKCS7_bio_stream.3
+++ b/lib/libcrypto/man/i2d_PKCS7_bio_stream.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: i2d_PKCS7_bio_stream.3,v 1.4 2016/12/06 14:45:08 schwarze Exp $
+.\" $OpenBSD: i2d_PKCS7_bio_stream.3,v 1.5 2016/12/08 21:48:50 jmc Exp $
.\" OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
.\"
.\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
@@ -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 6 2016 $
+.Dd $Mdocdate: December 8 2016 $
.Dt I2D_PKCS7_BIO_STREAM 3
.Os
.Sh NAME
@@ -69,10 +69,8 @@
outputs a
.Vt PKCS7
structure in BER format.
-.Pp
It is otherwise identical to the function
.Xr SMIME_write_PKCS7 3 .
-.Pp
This function is effectively a version of
.Xr d2i_PKCS7_bio 3
supporting streaming.
diff --git a/lib/libcrypto/man/x509.3 b/lib/libcrypto/man/x509.3
index 21e9af62fbd..3d2aadb1666 100644
--- a/lib/libcrypto/man/x509.3
+++ b/lib/libcrypto/man/x509.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: x509.3,v 1.3 2016/12/06 15:22:12 schwarze Exp $
+.\" $OpenBSD: x509.3,v 1.4 2016/12/08 21:48:50 jmc Exp $
.\" OpenSSL a9c85cea Nov 11 09:33:55 2016 +0100
.\"
.\" This file was written by Richard Levitte <levitte@openssl.org>
@@ -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 X509 3
.Os
.Sh NAME
@@ -62,7 +62,7 @@ individual, a device, or anything one can imagine.
A X.509 CRL (certificate revocation list) is a tool to help determine if
a certificate is still valid.
The exact definition of those can be found in the X.509 document from
-ITU-T, or in RFC3280 from PKIX.
+ITU-T, or in RFC 3280 from PKIX.
In OpenSSL, the type
.Vt X509
is used to express such a certificate, and the type
@@ -70,7 +70,7 @@ is used to express such a certificate, and the type
is used to express a CRL.
.Pp
A related structure is a certificate request, defined in PKCS#10 from
-RSA Security, Inc., also reflected in RFC2896.
+RSA Security, Inc., also reflected in RFC 2896.
In OpenSSL, the type
.Vt X509_REQ
is used to express such a certificate request.