summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjmc <>2016-12-08 21:48:50 +0000
committerjmc <>2016-12-08 21:48:50 +0000
commit5418cbcc35c07098b601750bd5e31ff1f58ff2ca (patch)
tree51adef57c1053c866821a29d02e0261f7f40dce0
parentd005c040eb015cb7a531a0fc79d93c52f0a6d3fa (diff)
downloadopenbsd-5418cbcc35c07098b601750bd5e31ff1f58ff2ca.tar.gz
openbsd-5418cbcc35c07098b601750bd5e31ff1f58ff2ca.tar.bz2
openbsd-5418cbcc35c07098b601750bd5e31ff1f58ff2ca.zip
minor cleanup;
-rw-r--r--src/lib/libcrypto/man/ASN1_STRING_print_ex.36
-rw-r--r--src/lib/libcrypto/man/des_read_pw.318
-rw-r--r--src/lib/libcrypto/man/ec.36
-rw-r--r--src/lib/libcrypto/man/i2d_PKCS7_bio_stream.36
-rw-r--r--src/lib/libcrypto/man/x509.38
5 files changed, 20 insertions, 24 deletions
diff --git a/src/lib/libcrypto/man/ASN1_STRING_print_ex.3 b/src/lib/libcrypto/man/ASN1_STRING_print_ex.3
index f63975c47b..8b9d4821a0 100644
--- a/src/lib/libcrypto/man/ASN1_STRING_print_ex.3
+++ b/src/lib/libcrypto/man/ASN1_STRING_print_ex.3
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ASN1_STRING_print_ex.3,v 1.5 2016/11/10 13:06:24 schwarze Exp $ 1.\" $OpenBSD: ASN1_STRING_print_ex.3,v 1.6 2016/12/08 21:48:50 jmc Exp $
2.\" OpenSSL bb9ad09e Mon Jun 6 00:43:05 2016 -0400 2.\" OpenSSL bb9ad09e Mon Jun 6 00:43:05 2016 -0400
3.\" 3.\"
4.\" This file was written by Dr. Stephen Henson. 4.\" This file was written by Dr. Stephen Henson.
@@ -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: November 10 2016 $ 52.Dd $Mdocdate: December 8 2016 $
53.Dt ASN1_STRING_PRINT_EX 3 53.Dt ASN1_STRING_PRINT_EX 3
54.Os 54.Os
55.Sh NAME 55.Sh NAME
@@ -189,7 +189,7 @@ is set, then the complete encoding is dumped
189instead (including tag and length octets). 189instead (including tag and length octets).
190.Pp 190.Pp
191.Dv ASN1_STRFLGS_RFC2253 191.Dv ASN1_STRFLGS_RFC2253
192includes all the flags required by RFC2253. 192includes all the flags required by RFC 2253.
193It is equivalent to 193It is equivalent to
194.Dv ASN1_STRFLGS_ESC_2253 | 194.Dv ASN1_STRFLGS_ESC_2253 |
195.Dv ASN1_STRFLGS_ESC_CTRL | 195.Dv ASN1_STRFLGS_ESC_CTRL |
diff --git a/src/lib/libcrypto/man/des_read_pw.3 b/src/lib/libcrypto/man/des_read_pw.3
index 87410b3c52..1f2fae984e 100644
--- a/src/lib/libcrypto/man/des_read_pw.3
+++ b/src/lib/libcrypto/man/des_read_pw.3
@@ -1,6 +1,6 @@
1.\" $OpenBSD: des_read_pw.3,v 1.3 2016/11/06 15:52:50 jmc Exp $ 1.\" $OpenBSD: des_read_pw.3,v 1.4 2016/12/08 21:48:50 jmc Exp $
2.\" 2.\"
3.Dd $Mdocdate: November 6 2016 $ 3.Dd $Mdocdate: December 8 2016 $
4.Dt DES_READ_PW 3 4.Dt DES_READ_PW 3
5.Os 5.Os
6.Sh NAME 6.Sh NAME
@@ -8,7 +8,7 @@
8.Nm des_read_2passwords , 8.Nm des_read_2passwords ,
9.Nm des_read_pw_string , 9.Nm des_read_pw_string ,
10.Nm des_read_pw 10.Nm des_read_pw
11.Nd Compatibility user interface functions 11.Nd compatibility user interface functions
12.Sh SYNOPSIS 12.Sh SYNOPSIS
13.In openssl/des_old.h 13.In openssl/des_old.h
14.Ft int 14.Ft int
@@ -47,7 +47,7 @@ part of the UI compatibility library.
47.Fn des_read_pw 47.Fn des_read_pw
48writes the string specified by 48writes the string specified by
49.Fa prompt 49.Fa prompt
50to standard output turns echo off and reads an input string from the 50to standard output, turns echo off, and reads an input string from the
51terminal. 51terminal.
52The string is returned in 52The string is returned in
53.Fa buf , 53.Fa buf ,
@@ -72,9 +72,12 @@ to do the work.
72.Fn des_read_pw_string 72.Fn des_read_pw_string
73is a variant of 73is a variant of
74.Fn des_read_pw 74.Fn des_read_pw
75that provides a buffer for you if 75that provides a buffer if
76.Fa verify 76.Fa verify
77is set. 77is set.
78It is available in the MIT Kerberos library as well,
79and is also available under the name
80.Xr EVP_read_pw_string 3 .
78.Pp 81.Pp
79.Fn des_read_password 82.Fn des_read_password
80calls 83calls
@@ -87,11 +90,6 @@ operates in the same way as
87except that it generates two keys by using the 90except that it generates two keys by using the
88.Xr DES_string_to_2key 3 91.Xr DES_string_to_2key 3
89function. 92function.
90.Sh NOTES
91.Fn des_read_pw_string
92is available in the MIT Kerberos library as well, and is also available
93under the name
94.Xr EVP_read_pw_string 3 .
95.Sh SEE ALSO 93.Sh SEE ALSO
96.Xr UI_new 3 94.Xr UI_new 3
97.Sh AUTHORS 95.Sh AUTHORS
diff --git a/src/lib/libcrypto/man/ec.3 b/src/lib/libcrypto/man/ec.3
index efc6f9ab9e..b3e0c8697e 100644
--- a/src/lib/libcrypto/man/ec.3
+++ b/src/lib/libcrypto/man/ec.3
@@ -1,6 +1,6 @@
1.\" $OpenBSD: ec.3,v 1.3 2016/11/06 15:57:38 schwarze Exp $ 1.\" $OpenBSD: ec.3,v 1.4 2016/12/08 21:48:50 jmc Exp $
2.\" 2.\"
3.Dd $Mdocdate: November 6 2016 $ 3.Dd $Mdocdate: December 8 2016 $
4.Dt EC 3 4.Dt EC 3
5.Os 5.Os
6.Sh NAME 6.Sh NAME
@@ -54,7 +54,7 @@ objects are explained in
54.Xr EC_POINT_new 3 , 54.Xr EC_POINT_new 3 ,
55whilst functions for performing mathematical operations and tests on 55whilst functions for performing mathematical operations and tests on
56.Vt EC_POINT Ns s 56.Vt EC_POINT Ns s
57are coverd in 57are covered in
58.Xr EC_POINT_add 3 . 58.Xr EC_POINT_add 3 .
59.Pp 59.Pp
60For working with private and public keys refer to 60For working with private and public keys refer to
diff --git a/src/lib/libcrypto/man/i2d_PKCS7_bio_stream.3 b/src/lib/libcrypto/man/i2d_PKCS7_bio_stream.3
index 694b320e49..6e813f2cc3 100644
--- a/src/lib/libcrypto/man/i2d_PKCS7_bio_stream.3
+++ b/src/lib/libcrypto/man/i2d_PKCS7_bio_stream.3
@@ -1,4 +1,4 @@
1.\" $OpenBSD: i2d_PKCS7_bio_stream.3,v 1.4 2016/12/06 14:45:08 schwarze Exp $ 1.\" $OpenBSD: i2d_PKCS7_bio_stream.3,v 1.5 2016/12/08 21:48:50 jmc Exp $
2.\" OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400 2.\" OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
3.\" 3.\"
4.\" This file was written by Dr. Stephen Henson <steve@openssl.org>. 4.\" 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: December 6 2016 $ 52.Dd $Mdocdate: December 8 2016 $
53.Dt I2D_PKCS7_BIO_STREAM 3 53.Dt I2D_PKCS7_BIO_STREAM 3
54.Os 54.Os
55.Sh NAME 55.Sh NAME
@@ -69,10 +69,8 @@
69outputs a 69outputs a
70.Vt PKCS7 70.Vt PKCS7
71structure in BER format. 71structure in BER format.
72.Pp
73It is otherwise identical to the function 72It is otherwise identical to the function
74.Xr SMIME_write_PKCS7 3 . 73.Xr SMIME_write_PKCS7 3 .
75.Pp
76This function is effectively a version of 74This function is effectively a version of
77.Xr d2i_PKCS7_bio 3 75.Xr d2i_PKCS7_bio 3
78supporting streaming. 76supporting streaming.
diff --git a/src/lib/libcrypto/man/x509.3 b/src/lib/libcrypto/man/x509.3
index 21e9af62fb..3d2aadb166 100644
--- a/src/lib/libcrypto/man/x509.3
+++ b/src/lib/libcrypto/man/x509.3
@@ -1,4 +1,4 @@
1.\" $OpenBSD: x509.3,v 1.3 2016/12/06 15:22:12 schwarze Exp $ 1.\" $OpenBSD: x509.3,v 1.4 2016/12/08 21:48:50 jmc 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 was written by Richard Levitte <levitte@openssl.org> 4.\" This file was written by Richard Levitte <levitte@openssl.org>
@@ -48,7 +48,7 @@
48.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 48.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
49.\" OF THE POSSIBILITY OF SUCH DAMAGE. 49.\" OF THE POSSIBILITY OF SUCH DAMAGE.
50.\" 50.\"
51.Dd $Mdocdate: December 6 2016 $ 51.Dd $Mdocdate: December 8 2016 $
52.Dt X509 3 52.Dt X509 3
53.Os 53.Os
54.Sh NAME 54.Sh NAME
@@ -62,7 +62,7 @@ individual, a device, or anything one can imagine.
62A X.509 CRL (certificate revocation list) is a tool to help determine if 62A X.509 CRL (certificate revocation list) is a tool to help determine if
63a certificate is still valid. 63a certificate is still valid.
64The exact definition of those can be found in the X.509 document from 64The exact definition of those can be found in the X.509 document from
65ITU-T, or in RFC3280 from PKIX. 65ITU-T, or in RFC 3280 from PKIX.
66In OpenSSL, the type 66In OpenSSL, the type
67.Vt X509 67.Vt X509
68is used to express such a certificate, and the type 68is used to express such a certificate, and the type
@@ -70,7 +70,7 @@ is used to express such a certificate, and the type
70is used to express a CRL. 70is used to express a CRL.
71.Pp 71.Pp
72A related structure is a certificate request, defined in PKCS#10 from 72A related structure is a certificate request, defined in PKCS#10 from
73RSA Security, Inc., also reflected in RFC2896. 73RSA Security, Inc., also reflected in RFC 2896.
74In OpenSSL, the type 74In OpenSSL, the type
75.Vt X509_REQ 75.Vt X509_REQ
76is used to express such a certificate request. 76is used to express such a certificate request.