6 files changed, 28 insertions, 28 deletions

diff --git a/src/lib/libcrypto/man/BN_generate_prime.3 b/src/lib/libcrypto/man/BN_generate_prime.3
index 7db27fd627..764ea6f873 100644
--- a/src/lib/libcrypto/man/BN_generate_prime.3
+++ b/src/lib/libcrypto/man/BN_generate_prime.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: BN_generate_prime.3,v 1.18 2019/08/25 19:24:00 schwarze Exp $
+.\" $OpenBSD: BN_generate_prime.3,v 1.19 2020/06/24 18:15:00 jmc Exp $
 .\" full merge up to: OpenSSL f987a4dd Jun 27 10:12:08 2019 +0200
 .\"
 .\" This file was written by Ulf Moeller <ulf@openssl.org>
@@ -50,7 +50,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 25 2019 $
+.Dd $Mdocdate: June 24 2020 $
 .Dt BN_GENERATE_PRIME 3
 .Os
 .Sh NAME
@@ -262,7 +262,7 @@ When the source of the prime is not random or not trusted, the
 number of checks needs to be much higher to reach the same level
 of assurance: It should equal half of the targeted security level
 in bits (rounded up to the next integer if necessary).
-For instance, to reach the 128 bit security level,
+For instance, to reach the 128-bit security level,
 .Fa nchecks
 should be set to 64.
 .Pp
diff --git a/src/lib/libcrypto/man/CMS_add1_signer.3 b/src/lib/libcrypto/man/CMS_add1_signer.3
index 7f8183f93f..9ee97dfaf4 100644
--- a/src/lib/libcrypto/man/CMS_add1_signer.3
+++ b/src/lib/libcrypto/man/CMS_add1_signer.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: CMS_add1_signer.3,v 1.7 2019/11/02 15:39:46 schwarze Exp $
+.\" $OpenBSD: CMS_add1_signer.3,v 1.8 2020/06/24 18:15:00 jmc Exp $
 .\" full merge up to: OpenSSL e9b77246 Jan 20 19:58:49 2017 +0100
 .\"
 .\" This file is a derived work.
@@ -65,7 +65,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: November 2 2019 $
+.Dd $Mdocdate: June 24 2020 $
 .Dt CMS_ADD1_SIGNER 3
 .Os
 .Sh NAME
@@ -196,9 +196,9 @@ By default, issuer name and serial number are used instead.
 If present, the
 .Vt SMIMECapabilities
 attribute indicates support for the
-following algorithms in preference order: 256 bit AES, Gost R3411-94,
-Gost 28147-89, 192 bit AES, 128 bit AES, triple DES, 128 bit RC2, 64 bit
-RC2, DES and 40 bit RC2.
+following algorithms in preference order: 256-bit AES, Gost R3411-94,
+Gost 28147-89, 192-bit AES, 128-bit AES, triple DES, 128-bit RC2, 64-bit
+RC2, DES and 40-bit RC2.
 If any of these algorithms is not available then it will not be
 included.
 .Pp
diff --git a/src/lib/libcrypto/man/CMS_sign.3 b/src/lib/libcrypto/man/CMS_sign.3
index f8cae4018d..64461959dd 100644
--- a/src/lib/libcrypto/man/CMS_sign.3
+++ b/src/lib/libcrypto/man/CMS_sign.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: CMS_sign.3,v 1.8 2019/11/02 15:39:46 schwarze Exp $
+.\" $OpenBSD: CMS_sign.3,v 1.9 2020/06/24 18:15:00 jmc Exp $
 .\" full merge up to: OpenSSL e9b77246 Jan 20 19:58:49 2017 +0100
 .\"
 .\" 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 2 2019 $
+.Dd $Mdocdate: June 24 2020 $
 .Dt CMS_SIGN 3
 .Os
 .Sh NAME
@@ -127,9 +127,9 @@ attribute.
 Omit just the
 .Vt SMIMECapabilities .
 If present, the SMIMECapabilities attribute indicates support for the
-following algorithms in preference order: 256 bit AES, Gost R3411-94,
-Gost 28147-89, 192 bit AES, 128 bit AES, triple DES, 128 bit RC2, 64 bit
-RC2, DES and 40 bit RC2.
+following algorithms in preference order: 256-bit AES, Gost R3411-94,
+Gost 28147-89, 192-bit AES, 128-bit AES, triple DES, 128-bit RC2, 64-bit
+RC2, DES and 40-bit RC2.
 If any of these algorithms is not available, then it will not be
 included.
 .It Dv CMS_USE_KEYID
diff --git a/src/lib/libcrypto/man/ChaCha.3 b/src/lib/libcrypto/man/ChaCha.3
index 909d8ca77d..6b037f80ad 100644
--- a/src/lib/libcrypto/man/ChaCha.3
+++ b/src/lib/libcrypto/man/ChaCha.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ChaCha.3,v 1.1 2020/06/24 17:00:38 schwarze Exp $
+.\" $OpenBSD: ChaCha.3,v 1.2 2020/06/24 18:15:00 jmc Exp $
 .\"
 .\" Copyright (c) 2020 Ingo Schwarze <schwarze@openbsd.org>
 .\"
@@ -71,7 +71,7 @@
 .Fc
 .Sh DESCRIPTION
 These functions provide a low-level implementation
-of the ChaCha stream cipher with 256 and 128 bit keys.
+of the ChaCha stream cipher with 256 and 128-bit keys.
 The number of rounds is hardcoded to 20;
 variants with 8 or 12 rounds are not supported.
 .Pp
@@ -216,16 +216,16 @@ from the first two thirds of
 RFC 8439: ChaCha20 and Poly1305 for IETF Protocols
 .Pp
 Note that the standard specifies
-a 32 bit counter and a 96 bit initialization vector whereas
+a 32-bit counter and a 96-bit initialization vector whereas
 this implementation follows Bernstein's original specification
-and uses a 64 bit counter and a 64 bit initialization vector.
+and uses a 64-bit counter and a 64-bit initialization vector.
 .Pp
 These functions are specific to LibreSSL and not provided by OpenSSL.
 BoringSSL does provide
 .Fn CRYPTO_chacha_20 ,
-but with an incompatible interface, taking a 96 bit
+but with an incompatible interface, taking a 96-bit
 .Fa iv
-and a 32 bit
+and a 32-bit
 .Fa counter .
 .Sh HISTORY
 .Fn ChaCha_set_key ,
diff --git a/src/lib/libcrypto/man/EVP_aes_128_cbc.3 b/src/lib/libcrypto/man/EVP_aes_128_cbc.3
index f25df8c7eb..ac63f7f1f2 100644
--- a/src/lib/libcrypto/man/EVP_aes_128_cbc.3
+++ b/src/lib/libcrypto/man/EVP_aes_128_cbc.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: EVP_aes_128_cbc.3,v 1.3 2019/08/28 10:37:42 schwarze Exp $
+.\" $OpenBSD: EVP_aes_128_cbc.3,v 1.4 2020/06/24 18:15:00 jmc Exp $
 .\" selective merge up to: OpenSSL 7c6d372a Nov 20 13:20:01 2018 +0000
 .\"
 .\" This file was written by Ronald Tse <ronald.tse@ribose.com>
@@ -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: August 28 2019 $
+.Dd $Mdocdate: June 24 2020 $
 .Dt EVP_AES_128_CBC 3
 .Os
 .Sh NAME
@@ -193,7 +193,7 @@ framework.
 .Fn EVP_aes_192_ofb ,
 and
 .Fn EVP_aes_256_ofb
-provide AES for 128, 192, and 256 bit keys in the following modes:
+provide AES for 128, 192, and 256-bit keys in the following modes:
 CBC, CFB with 1-bit shift, CFB with 8-bit shift, CFB with 128-bit shift,
 CTR, ECB, and OFB.
 .Pp
@@ -211,7 +211,7 @@ and
 and
 .Fn EVP_aes_256_cbc_hmac_sha1
 provide authenticated encryption with AES in CBC mode using SHA-1 as HMAC,
-with keys of 128 and 256 bits length respectively.
+with keys of 128 and 256-bit length respectively.
 The authentication tag is 160 bits long.
 This is not intended for usage outside of TLS and requires
 calling of some undocumented control functions.
@@ -224,7 +224,7 @@ These ciphers do not conform to the EVP AEAD interface.
 .Fn EVP_aes_192_gcm ,
 and
 .Fn EVP_aes_256_gcm
-provide AES for 128, 192 and 256 bit keys in CBC-MAC Mode (CCM)
+provide AES for 128, 192 and 256-bit keys in CBC-MAC Mode (CCM)
 and Galois Counter Mode (GCM), respectively.
 These ciphers require additional control operations to function
 correctly; see
@@ -235,7 +235,7 @@ for details.
 .Fn EVP_aes_192_wrap ,
 and
 .Fn EVP_aes_256_wrap
-provide AES key wrap with 128, 192 and 256 bit keys
+provide AES key wrap with 128, 192 and 256-bit keys
 according to RFC 3394 section 2.2.1 ("wrap").
 When the returned
 .Vt EVP_CIPHER
diff --git a/src/lib/libcrypto/man/EVP_camellia_128_cbc.3 b/src/lib/libcrypto/man/EVP_camellia_128_cbc.3
index dd7f15d86c..190247a68b 100644
--- a/src/lib/libcrypto/man/EVP_camellia_128_cbc.3
+++ b/src/lib/libcrypto/man/EVP_camellia_128_cbc.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: EVP_camellia_128_cbc.3,v 1.1 2019/03/21 14:15:13 schwarze Exp $
+.\" $OpenBSD: EVP_camellia_128_cbc.3,v 1.2 2020/06/24 18:15:00 jmc Exp $
 .\" selective merge up to: OpenSSL 7c6d372a Nov 20 13:20:01 2018 +0000
 .\"
 .\" This file was written by Ronald Tse <ronald.tse@ribose.com>
@@ -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: March 21 2019 $
+.Dd $Mdocdate: June 24 2020 $
 .Dt EVP_CAMELLIA_128_CBC 3
 .Os
 .Sh NAME
@@ -122,7 +122,7 @@
 These functions provide the Camellia encryption algorithm in the
 .Xr evp 3
 framework.
-They use 128, 192, and 256 bit keys in the following modes, respectively:
+They use 128, 192, and 256-bit keys in the following modes, respectively:
 CBC, CFB with 1-bit shift, CFB with 8-bit shift, CFB with 128-bit shift,
 ECB, and OFB.
 .Pp