summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmc <jmc@openbsd.org>2016-11-12 19:23:16 +0000
committerjmc <jmc@openbsd.org>2016-11-12 19:23:16 +0000
commitd06d0309a7a711261fb813d071b1783345266580 (patch)
tree26d9b9abf629f3e727e7e18dfb8be0c885caf65e
parentApply the right fix for run -b, used the wrong diff before. (diff)
downloadwireguard-openbsd-d06d0309a7a711261fb813d071b1783345266580.tar.xz
wireguard-openbsd-d06d0309a7a711261fb813d071b1783345266580.zip
minor cleanup;
-rw-r--r--lib/libcrypto/man/ASN1_TYPE_get.36
-rw-r--r--lib/libcrypto/man/DH_generate_key.38
-rw-r--r--lib/libcrypto/man/DH_generate_parameters.310
-rw-r--r--lib/libcrypto/man/DH_set_method.36
-rw-r--r--lib/libcrypto/man/DSA_set_method.310
5 files changed, 20 insertions, 20 deletions
diff --git a/lib/libcrypto/man/ASN1_TYPE_get.3 b/lib/libcrypto/man/ASN1_TYPE_get.3
index cb7f7150361..5531e572d10 100644
--- a/lib/libcrypto/man/ASN1_TYPE_get.3
+++ b/lib/libcrypto/man/ASN1_TYPE_get.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ASN1_TYPE_get.3,v 1.1 2016/11/11 01:18:19 schwarze Exp $
+.\" $OpenBSD: ASN1_TYPE_get.3,v 1.2 2016/11/12 19:23:16 jmc Exp $
.\" OpenSSL 99d63d46 Mon Jun 6 00:43:05 2016 -0400
.\"
.\" This file was written by Dr. Stephen Henson <steve@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: November 11 2016 $
+.Dd $Mdocdate: November 12 2016 $
.Dt ASN1_TYPE_GET 3
.Os
.Sh NAME
@@ -190,7 +190,7 @@ Technically, if both parameters are
the two types could be absent OPTIONAL fields and so should match,
however passing
.Dv NULL
-Values could also indicate a programming error (for example an
+values could also indicate a programming error (for example an
unparseable type which returns
.Dv NULL )
for types which do
diff --git a/lib/libcrypto/man/DH_generate_key.3 b/lib/libcrypto/man/DH_generate_key.3
index 94fe00823ef..b9249cb3b9d 100644
--- a/lib/libcrypto/man/DH_generate_key.3
+++ b/lib/libcrypto/man/DH_generate_key.3
@@ -1,6 +1,6 @@
-.\" $OpenBSD: DH_generate_key.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\" $OpenBSD: DH_generate_key.3,v 1.3 2016/11/12 19:23:16 jmc Exp $
.\"
-.Dd $Mdocdate: November 6 2016 $
+.Dd $Mdocdate: November 12 2016 $
.Dt DH_GENERATE_KEY 3
.Os
.Sh NAME
@@ -54,10 +54,10 @@ must point to
bytes of memory.
.Sh RETURN VALUES
.Fn DH_generate_key
-returns 1 on success, 0 otherwise.
+returns 1 on success, or 0 otherwise.
.Pp
.Fn DH_compute_key
-returns the size of the shared secret on success, -1 on error.
+returns the size of the shared secret on success, or -1 on error.
.Pp
The error codes can be obtained by
.Xr ERR_get_error 3 .
diff --git a/lib/libcrypto/man/DH_generate_parameters.3 b/lib/libcrypto/man/DH_generate_parameters.3
index b092ad02638..01b13609cb2 100644
--- a/lib/libcrypto/man/DH_generate_parameters.3
+++ b/lib/libcrypto/man/DH_generate_parameters.3
@@ -1,12 +1,12 @@
-.\" $OpenBSD: DH_generate_parameters.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\" $OpenBSD: DH_generate_parameters.3,v 1.3 2016/11/12 19:23:16 jmc Exp $
.\"
-.Dd $Mdocdate: November 6 2016 $
+.Dd $Mdocdate: November 12 2016 $
.Dt DH_GENERATE_PARAMETERS 3
.Os
.Sh NAME
.Nm DH_generate_parameters_ex ,
-.Nm DH_generate_parameters ,
-.Nm DH_check
+.Nm DH_check ,
+.Nm DH_generate_parameters
.Nd generate and check Diffie-Hellman parameters
.Sh SYNOPSIS
.In openssl/dh.h
@@ -79,7 +79,7 @@ is set if the generator cannot be checked, i.e. if it does not equal 2 or 5.
.Fn DH_generate_parameters_ex
and
.Fn DH_check
-return 1 if the check could be performed, 0 otherwise.
+return 1 if the check could be performed, or 0 otherwise.
.Pp
.Fn DH_generate_parameters
(deprecated) returns a pointer to the
diff --git a/lib/libcrypto/man/DH_set_method.3 b/lib/libcrypto/man/DH_set_method.3
index 93cdf5576d2..c20ea3b4e4d 100644
--- a/lib/libcrypto/man/DH_set_method.3
+++ b/lib/libcrypto/man/DH_set_method.3
@@ -1,6 +1,6 @@
-.\" $OpenBSD: DH_set_method.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\" $OpenBSD: DH_set_method.3,v 1.3 2016/11/12 19:23:16 jmc Exp $
.\"
-.Dd $Mdocdate: November 6 2016 $
+.Dd $Mdocdate: November 12 2016 $
.Dt DH_SET_METHOD 3
.Os
.Sh NAME
@@ -109,7 +109,7 @@ is
.Dv NULL ,
the default
.Vt ENGINE
-for DH operations is used, and if no default
+for DH operations is used and, if no default
.Vt ENGINE
is set, the
.Vt DH_METHOD
diff --git a/lib/libcrypto/man/DSA_set_method.3 b/lib/libcrypto/man/DSA_set_method.3
index f7c16492ffe..8266e1abad5 100644
--- a/lib/libcrypto/man/DSA_set_method.3
+++ b/lib/libcrypto/man/DSA_set_method.3
@@ -1,6 +1,6 @@
-.\" $OpenBSD: DSA_set_method.3,v 1.2 2016/11/06 15:52:50 jmc Exp $
+.\" $OpenBSD: DSA_set_method.3,v 1.3 2016/11/12 19:23:16 jmc Exp $
.\"
-.Dd $Mdocdate: November 6 2016 $
+.Dd $Mdocdate: November 12 2016 $
.Dt DSA_SET_METHOD 3
.Os
.Sh NAME
@@ -55,8 +55,8 @@ makes
the default method for all
.Vt DSA
structures created later.
-.Sy NB :
-This is true only whilst no
+.Sy Note :
+this is true only whilst no
.Vt ENGINE
has been set as a default for DSA, so this function is no longer
recommended.
@@ -99,7 +99,7 @@ If
.Fa engine
is
.Dv NULL ,
-the default engine for DSA operations is used, and if no
+the default engine for DSA operations is used and, if no
default
.Vt ENGINE
is set, the