security/openssl111: Update to 1.1.1a

 - Fix prefix [1]

PR:		233173 [1]
Submitted by:	John Hein <z7dr6ut7gs snkmail com> [1]

5 files changed, 73 insertions, 139 deletions

diff --git a/security/openssl111/Makefile b/security/openssl111/Makefile
index 310d55995369..392ac6196198 100644
--- a/security/openssl111/Makefile
+++ b/security/openssl111/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openssl
-DISTVERSION=	1.1.1
-PORTREVISION=	2
+DISTVERSION=	1.1.1a
 CATEGORIES=	security devel
 MASTER_SITES=	https://www.openssl.org/source/ \
 		ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
@@ -17,13 +16,13 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CONFLICTS_INSTALL=	libressl-[0-9]* \
 			libressl-devel-[0-9]* \
-			openssl-[0-9]* \
-			openssl-devel-[0-9]*
+			openssl-[0-9]*
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	config
 CONFIGURE_ENV=	PERL="${PERL}"
-CONFIGURE_ARGS=	--openssldir=${OPENSSLDIR}
+CONFIGURE_ARGS=	--openssldir=${OPENSSLDIR} \
+		--prefix=${PREFIX}
 
 USES=		cpe perl5
 USE_PERL5=	build
diff --git a/security/openssl111/distinfo b/security/openssl111/distinfo
index 72f071b891bd..7ca95cd4637a 100644
--- a/security/openssl111/distinfo
+++ b/security/openssl111/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1536741340
-SHA256 (openssl-1.1.1.tar.gz) = 2836875a0f89c03d0fdf483941512613a50cfb421d6fd94b9f41d7279d586a3d
-SIZE (openssl-1.1.1.tar.gz) = 8337920
+TIMESTAMP = 1542732730
+SHA256 (openssl-1.1.1a.tar.gz) = fc20130f8b7cbd2fb918b2f14e2f429e109c31ddd0fb38fc5d71d9ffed3f9f41
+SIZE (openssl-1.1.1a.tar.gz) = 8350547
diff --git a/security/openssl111/files/patch-CVE-2018-0734 b/security/openssl111/files/patch-CVE-2018-0734
deleted file mode 100644
index b2e8ad5c87bd..000000000000
--- a/security/openssl111/files/patch-CVE-2018-0734
+++ /dev/null
@@ -1,98 +0,0 @@
-Timing vulnerability in DSA signature generation (CVE-2018-0734).
-
-Avoid a timing attack that leaks information via a side channel that
-triggers when a BN is resized.  Increasing the size of the BNs
-prior to doing anything with them suppresses the attack.
-
-Thanks due to Samuel Weiser for finding and locating this.
-
-Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
-(Merged from #7486)
-
-(cherry picked from commit a9cfb8c)
-
-https://github.com/openssl/openssl/commit/8abfe72e8c1de1b95f50aa0d9134803b4d00070f
---- crypto/dsa/dsa_ossl.c.orig	2018-09-11 12:48:21 UTC
-+++ crypto/dsa/dsa_ossl.c
-@@ -9,6 +9,7 @@
- 
- #include <stdio.h>
- #include "internal/cryptlib.h"
-+#include "internal/bn_int.h"
- #include <openssl/bn.h>
- #include <openssl/sha.h>
- #include "dsa_locl.h"
-@@ -178,9 +179,9 @@ static int dsa_sign_setup(DSA *dsa, BN_C
- {
-     BN_CTX *ctx = NULL;
-     BIGNUM *k, *kinv = NULL, *r = *rp;
--    BIGNUM *l, *m;
-+    BIGNUM *l;
-     int ret = 0;
--    int q_bits;
-+    int q_bits, q_words;
- 
-     if (!dsa->p || !dsa->q || !dsa->g) {
-         DSAerr(DSA_F_DSA_SIGN_SETUP, DSA_R_MISSING_PARAMETERS);
-@@ -189,8 +190,7 @@ static int dsa_sign_setup(DSA *dsa, BN_C
- 
-     k = BN_new();
-     l = BN_new();
--    m = BN_new();
--    if (k == NULL || l == NULL || m == NULL)
-+    if (k == NULL || l == NULL)
-         goto err;
- 
-     if (ctx_in == NULL) {
-@@ -201,9 +201,9 @@ static int dsa_sign_setup(DSA *dsa, BN_C
- 
-     /* Preallocate space */
-     q_bits = BN_num_bits(dsa->q);
--    if (!BN_set_bit(k, q_bits)
--        || !BN_set_bit(l, q_bits)
--        || !BN_set_bit(m, q_bits))
-+    q_words = bn_get_top(dsa->q);
-+    if (!bn_wexpand(k, q_words + 2)
-+        || !bn_wexpand(l, q_words + 2))
-         goto err;
- 
-     /* Get random k */
-@@ -238,14 +238,17 @@ static int dsa_sign_setup(DSA *dsa, BN_C
-      * small timing information leakage.  We then choose the sum that is
-      * one bit longer than the modulus.
-      *
--     * TODO: revisit the BN_copy aiming for a memory access agnostic
--     * conditional copy.
-+     * There are some concerns about the efficacy of doing this.  More
-+     * specificly refer to the discussion starting with:
-+     *     https://github.com/openssl/openssl/pull/7486#discussion_r228323705
-+     * The fix is to rework BN so these gymnastics aren't required.
-      */
-     if (!BN_add(l, k, dsa->q)
--        || !BN_add(m, l, dsa->q)
--        || !BN_copy(k, BN_num_bits(l) > q_bits ? l : m))
-+        || !BN_add(k, l, dsa->q))
-         goto err;
- 
-+    BN_consttime_swap(BN_is_bit_set(l, q_bits), k, l, q_words + 2);
-+
-     if ((dsa)->meth->bn_mod_exp != NULL) {
-             if (!dsa->meth->bn_mod_exp(dsa, r, dsa->g, k, dsa->p, ctx,
-                                        dsa->method_mont_p))
-@@ -258,7 +261,7 @@ static int dsa_sign_setup(DSA *dsa, BN_C
-     if (!BN_mod(r, r, dsa->q, ctx))
-         goto err;
- 
--    /* Compute  part of 's = inv(k) (m + xr) mod q' */
-+    /* Compute part of 's = inv(k) (m + xr) mod q' */
-     if ((kinv = BN_mod_inverse(NULL, k, dsa->q, ctx)) == NULL)
-         goto err;
- 
-@@ -273,7 +276,6 @@ static int dsa_sign_setup(DSA *dsa, BN_C
-         BN_CTX_free(ctx);
-     BN_clear_free(k);
-     BN_clear_free(l);
--    BN_clear_free(m);
-     return ret;
- }
- 
diff --git a/security/openssl111/files/patch-CVE-2018-0735 b/security/openssl111/files/patch-CVE-2018-0735
deleted file mode 100644
index 2d216c4be249..000000000000
--- a/security/openssl111/files/patch-CVE-2018-0735
+++ /dev/null
@@ -1,33 +0,0 @@
-Timing vulnerability in ECDSA signature generation (CVE-2018-0735)
-
-Preallocate an extra limb for some of the big numbers to avoid a reallocation
-that can potentially provide a side channel.
-
-Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
-(Merged from #7486)
-
-(cherry picked from commit 99540ec)
-
-https://www.openssl.org/news/secadv/20181029.txt
---- crypto/ec/ec_mult.c.orig	2018-09-11 12:48:21 UTC
-+++ crypto/ec/ec_mult.c
-@@ -206,8 +206,8 @@ int ec_scalar_mul_ladder(const EC_GROUP 
-      */
-     cardinality_bits = BN_num_bits(cardinality);
-     group_top = bn_get_top(cardinality);
--    if ((bn_wexpand(k, group_top + 1) == NULL)
--        || (bn_wexpand(lambda, group_top + 1) == NULL)) {
-+    if ((bn_wexpand(k, group_top + 2) == NULL)
-+        || (bn_wexpand(lambda, group_top + 2) == NULL)) {
-         ECerr(EC_F_EC_SCALAR_MUL_LADDER, ERR_R_BN_LIB);
-         goto err;
-     }
-@@ -244,7 +244,7 @@ int ec_scalar_mul_ladder(const EC_GROUP 
-      * k := scalar + 2*cardinality
-      */
-     kbit = BN_is_bit_set(lambda, cardinality_bits);
--    BN_consttime_swap(kbit, k, lambda, group_top + 1);
-+    BN_consttime_swap(kbit, k, lambda, group_top + 2);
- 
-     group_top = bn_get_top(group->field);
-     if ((bn_wexpand(s->X, group_top) == NULL)
diff --git a/security/openssl111/pkg-plist b/security/openssl111/pkg-plist
index 517d9063e088..fd4f8611b801 100644
--- a/security/openssl111/pkg-plist
+++ b/security/openssl111/pkg-plist
@@ -1419,17 +1419,38 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_add1_tls1_prf_seed.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_ctrl.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_ctrl_str.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_ctrl_uint64.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_dup.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_free.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_get0_dh_kdf_oid.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_get0_dh_kdf_ukm.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_get0_ecdh_kdf_ukm.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_get0_rsa_oaep_label.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_get1_id.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_get1_id_len.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_get_app_data.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_get_cb.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_get_dh_kdf_md.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_get_dh_kdf_outlen.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_get_dh_kdf_type.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_get_ecdh_cofactor_mode.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_get_ecdh_kdf_md.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_get_ecdh_kdf_outlen.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_get_ecdh_kdf_type.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_get_keygen_info.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_get_rsa_mgf1_md.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_get_rsa_oaep_md.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_get_rsa_padding.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_get_rsa_pss_saltlen.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_get_signature_md.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_hkdf_mode.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_md.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_new.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_new_id.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_set0_dh_kdf_oid.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_set0_dh_kdf_ukm.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_set0_ecdh_kdf_ukm.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_set0_rsa_oaep_label.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set1_hkdf_key.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set1_hkdf_salt.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set1_id.3.gz
@@ -1438,17 +1459,31 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set1_tls1_prf_secret.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_app_data.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_cb.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_set_dh_kdf_md.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_set_dh_kdf_outlen.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_set_dh_kdf_type.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_dh_nid.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_dh_pad.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_dh_paramgen_generator.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_dh_paramgen_prime_len.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_set_dh_paramgen_subprime_len.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_set_dh_paramgen_type.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_set_dh_rfc5114.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_set_dhx_rfc5114.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_dsa_paramgen_bits.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_ec_param_enc.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_ec_paramgen_curve_nid.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_set_ecdh_cofactor_mode.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_set_ecdh_kdf_md.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_set_ecdh_kdf_outlen.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_set_ecdh_kdf_type.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_hkdf_md.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_mac_key.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_rsa_keygen_bits.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_set_rsa_keygen_primes.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_rsa_keygen_pubexp.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_set_rsa_mgf1_md.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_set_rsa_oaep_md.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_rsa_padding.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_md.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_rsa_pss_keygen_mgf1_md.3.gz
@@ -1489,7 +1524,9 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/EVP_PKEY_assign_DH.3.gz
 %%MAN3%%man/man3/EVP_PKEY_assign_DSA.3.gz
 %%MAN3%%man/man3/EVP_PKEY_assign_EC_KEY.3.gz
+%%MAN3%%man/man3/EVP_PKEY_assign_POLY1305.3.gz
 %%MAN3%%man/man3/EVP_PKEY_assign_RSA.3.gz
+%%MAN3%%man/man3/EVP_PKEY_assign_SIPHASH.3.gz
 %%MAN3%%man/man3/EVP_PKEY_base_id.3.gz
 %%MAN3%%man/man3/EVP_PKEY_check.3.gz
 %%MAN3%%man/man3/EVP_PKEY_cmp.3.gz
@@ -1510,6 +1547,8 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/EVP_PKEY_get0_RSA.3.gz
 %%MAN3%%man/man3/EVP_PKEY_get0_asn1.3.gz
 %%MAN3%%man/man3/EVP_PKEY_get0_hmac.3.gz
+%%MAN3%%man/man3/EVP_PKEY_get0_poly1305.3.gz
+%%MAN3%%man/man3/EVP_PKEY_get0_siphash.3.gz
 %%MAN3%%man/man3/EVP_PKEY_get1_DH.3.gz
 %%MAN3%%man/man3/EVP_PKEY_get1_DSA.3.gz
 %%MAN3%%man/man3/EVP_PKEY_get1_EC_KEY.3.gz
@@ -1612,6 +1651,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/EVP_aes_128_ccm.3.gz
 %%MAN3%%man/man3/EVP_aes_128_cfb.3.gz
 %%MAN3%%man/man3/EVP_aes_128_cfb1.3.gz
+%%MAN3%%man/man3/EVP_aes_128_cfb128.3.gz
 %%MAN3%%man/man3/EVP_aes_128_cfb8.3.gz
 %%MAN3%%man/man3/EVP_aes_128_ctr.3.gz
 %%MAN3%%man/man3/EVP_aes_128_ecb.3.gz
@@ -1625,6 +1665,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/EVP_aes_192_ccm.3.gz
 %%MAN3%%man/man3/EVP_aes_192_cfb.3.gz
 %%MAN3%%man/man3/EVP_aes_192_cfb1.3.gz
+%%MAN3%%man/man3/EVP_aes_192_cfb128.3.gz
 %%MAN3%%man/man3/EVP_aes_192_cfb8.3.gz
 %%MAN3%%man/man3/EVP_aes_192_ctr.3.gz
 %%MAN3%%man/man3/EVP_aes_192_ecb.3.gz
@@ -1639,6 +1680,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/EVP_aes_256_ccm.3.gz
 %%MAN3%%man/man3/EVP_aes_256_cfb.3.gz
 %%MAN3%%man/man3/EVP_aes_256_cfb1.3.gz
+%%MAN3%%man/man3/EVP_aes_256_cfb128.3.gz
 %%MAN3%%man/man3/EVP_aes_256_cfb8.3.gz
 %%MAN3%%man/man3/EVP_aes_256_ctr.3.gz
 %%MAN3%%man/man3/EVP_aes_256_ecb.3.gz
@@ -1653,6 +1695,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/EVP_aria_128_ccm.3.gz
 %%MAN3%%man/man3/EVP_aria_128_cfb.3.gz
 %%MAN3%%man/man3/EVP_aria_128_cfb1.3.gz
+%%MAN3%%man/man3/EVP_aria_128_cfb128.3.gz
 %%MAN3%%man/man3/EVP_aria_128_cfb8.3.gz
 %%MAN3%%man/man3/EVP_aria_128_ctr.3.gz
 %%MAN3%%man/man3/EVP_aria_128_ecb.3.gz
@@ -1662,6 +1705,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/EVP_aria_192_ccm.3.gz
 %%MAN3%%man/man3/EVP_aria_192_cfb.3.gz
 %%MAN3%%man/man3/EVP_aria_192_cfb1.3.gz
+%%MAN3%%man/man3/EVP_aria_192_cfb128.3.gz
 %%MAN3%%man/man3/EVP_aria_192_cfb8.3.gz
 %%MAN3%%man/man3/EVP_aria_192_ctr.3.gz
 %%MAN3%%man/man3/EVP_aria_192_ecb.3.gz
@@ -1671,6 +1715,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/EVP_aria_256_ccm.3.gz
 %%MAN3%%man/man3/EVP_aria_256_cfb.3.gz
 %%MAN3%%man/man3/EVP_aria_256_cfb1.3.gz
+%%MAN3%%man/man3/EVP_aria_256_cfb128.3.gz
 %%MAN3%%man/man3/EVP_aria_256_cfb8.3.gz
 %%MAN3%%man/man3/EVP_aria_256_ctr.3.gz
 %%MAN3%%man/man3/EVP_aria_256_ecb.3.gz
@@ -1678,6 +1723,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/EVP_aria_256_ofb.3.gz
 %%MAN3%%man/man3/EVP_bf_cbc.3.gz
 %%MAN3%%man/man3/EVP_bf_cfb.3.gz
+%%MAN3%%man/man3/EVP_bf_cfb64.3.gz
 %%MAN3%%man/man3/EVP_bf_ecb.3.gz
 %%MAN3%%man/man3/EVP_bf_ofb.3.gz
 %%MAN3%%man/man3/EVP_blake2b512.3.gz
@@ -1686,6 +1732,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/EVP_camellia_128_cbc.3.gz
 %%MAN3%%man/man3/EVP_camellia_128_cfb.3.gz
 %%MAN3%%man/man3/EVP_camellia_128_cfb1.3.gz
+%%MAN3%%man/man3/EVP_camellia_128_cfb128.3.gz
 %%MAN3%%man/man3/EVP_camellia_128_cfb8.3.gz
 %%MAN3%%man/man3/EVP_camellia_128_ctr.3.gz
 %%MAN3%%man/man3/EVP_camellia_128_ecb.3.gz
@@ -1693,6 +1740,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/EVP_camellia_192_cbc.3.gz
 %%MAN3%%man/man3/EVP_camellia_192_cfb.3.gz
 %%MAN3%%man/man3/EVP_camellia_192_cfb1.3.gz
+%%MAN3%%man/man3/EVP_camellia_192_cfb128.3.gz
 %%MAN3%%man/man3/EVP_camellia_192_cfb8.3.gz
 %%MAN3%%man/man3/EVP_camellia_192_ctr.3.gz
 %%MAN3%%man/man3/EVP_camellia_192_ecb.3.gz
@@ -1700,12 +1748,14 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/EVP_camellia_256_cbc.3.gz
 %%MAN3%%man/man3/EVP_camellia_256_cfb.3.gz
 %%MAN3%%man/man3/EVP_camellia_256_cfb1.3.gz
+%%MAN3%%man/man3/EVP_camellia_256_cfb128.3.gz
 %%MAN3%%man/man3/EVP_camellia_256_cfb8.3.gz
 %%MAN3%%man/man3/EVP_camellia_256_ctr.3.gz
 %%MAN3%%man/man3/EVP_camellia_256_ecb.3.gz
 %%MAN3%%man/man3/EVP_camellia_256_ofb.3.gz
 %%MAN3%%man/man3/EVP_cast5_cbc.3.gz
 %%MAN3%%man/man3/EVP_cast5_cfb.3.gz
+%%MAN3%%man/man3/EVP_cast5_cfb64.3.gz
 %%MAN3%%man/man3/EVP_cast5_ecb.3.gz
 %%MAN3%%man/man3/EVP_cast5_ofb.3.gz
 %%MAN3%%man/man3/EVP_chacha20.3.gz
@@ -1715,6 +1765,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/EVP_des_cbc.3.gz
 %%MAN3%%man/man3/EVP_des_cfb.3.gz
 %%MAN3%%man/man3/EVP_des_cfb1.3.gz
+%%MAN3%%man/man3/EVP_des_cfb64.3.gz
 %%MAN3%%man/man3/EVP_des_cfb8.3.gz
 %%MAN3%%man/man3/EVP_des_ecb.3.gz
 %%MAN3%%man/man3/EVP_des_ede.3.gz
@@ -1722,11 +1773,15 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/EVP_des_ede3_cbc.3.gz
 %%MAN3%%man/man3/EVP_des_ede3_cfb.3.gz
 %%MAN3%%man/man3/EVP_des_ede3_cfb1.3.gz
+%%MAN3%%man/man3/EVP_des_ede3_cfb64.3.gz
 %%MAN3%%man/man3/EVP_des_ede3_cfb8.3.gz
+%%MAN3%%man/man3/EVP_des_ede3_ecb.3.gz
 %%MAN3%%man/man3/EVP_des_ede3_ofb.3.gz
 %%MAN3%%man/man3/EVP_des_ede3_wrap.3.gz
 %%MAN3%%man/man3/EVP_des_ede_cbc.3.gz
 %%MAN3%%man/man3/EVP_des_ede_cfb.3.gz
+%%MAN3%%man/man3/EVP_des_ede_cfb64.3.gz
+%%MAN3%%man/man3/EVP_des_ede_ecb.3.gz
 %%MAN3%%man/man3/EVP_des_ede_ofb.3.gz
 %%MAN3%%man/man3/EVP_des_ofb.3.gz
 %%MAN3%%man/man3/EVP_desx_cbc.3.gz
@@ -1739,17 +1794,20 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/EVP_get_digestbyobj.3.gz
 %%MAN3%%man/man3/EVP_idea_cbc.3.gz
 %%MAN3%%man/man3/EVP_idea_cfb.3.gz
+%%MAN3%%man/man3/EVP_idea_cfb64.3.gz
 %%MAN3%%man/man3/EVP_idea_ecb.3.gz
 %%MAN3%%man/man3/EVP_idea_ofb.3.gz
 %%MAN3%%man/man3/EVP_md2.3.gz
 %%MAN3%%man/man3/EVP_md4.3.gz
 %%MAN3%%man/man3/EVP_md5.3.gz
+%%MAN3%%man/man3/EVP_md5_sha1.3.gz
 %%MAN3%%man/man3/EVP_md_null.3.gz
 %%MAN3%%man/man3/EVP_mdc2.3.gz
 %%MAN3%%man/man3/EVP_rc2_40_cbc.3.gz
 %%MAN3%%man/man3/EVP_rc2_64_cbc.3.gz
 %%MAN3%%man/man3/EVP_rc2_cbc.3.gz
 %%MAN3%%man/man3/EVP_rc2_cfb.3.gz
+%%MAN3%%man/man3/EVP_rc2_cfb64.3.gz
 %%MAN3%%man/man3/EVP_rc2_ecb.3.gz
 %%MAN3%%man/man3/EVP_rc2_ofb.3.gz
 %%MAN3%%man/man3/EVP_rc4.3.gz
@@ -1757,11 +1815,13 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/EVP_rc4_hmac_md5.3.gz
 %%MAN3%%man/man3/EVP_rc5_32_12_16_cbc.3.gz
 %%MAN3%%man/man3/EVP_rc5_32_12_16_cfb.3.gz
+%%MAN3%%man/man3/EVP_rc5_32_12_16_cfb64.3.gz
 %%MAN3%%man/man3/EVP_rc5_32_12_16_ecb.3.gz
 %%MAN3%%man/man3/EVP_rc5_32_12_16_ofb.3.gz
 %%MAN3%%man/man3/EVP_ripemd160.3.gz
 %%MAN3%%man/man3/EVP_seed_cbc.3.gz
 %%MAN3%%man/man3/EVP_seed_cfb.3.gz
+%%MAN3%%man/man3/EVP_seed_cfb128.3.gz
 %%MAN3%%man/man3/EVP_seed_ecb.3.gz
 %%MAN3%%man/man3/EVP_seed_ofb.3.gz
 %%MAN3%%man/man3/EVP_sha1.3.gz
@@ -1780,6 +1840,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/EVP_sm3.3.gz
 %%MAN3%%man/man3/EVP_sm4_cbc.3.gz
 %%MAN3%%man/man3/EVP_sm4_cfb.3.gz
+%%MAN3%%man/man3/EVP_sm4_cfb128.3.gz
 %%MAN3%%man/man3/EVP_sm4_ctr.3.gz
 %%MAN3%%man/man3/EVP_sm4_ecb.3.gz
 %%MAN3%%man/man3/EVP_sm4_ofb.3.gz
@@ -1962,6 +2023,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/OPENSSL_MALLOC_FAILURES.3.gz
 %%MAN3%%man/man3/OPENSSL_MALLOC_FD.3.gz
 %%MAN3%%man/man3/OPENSSL_VERSION_NUMBER.3.gz
+%%MAN3%%man/man3/OPENSSL_VERSION_TEXT.3.gz
 %%MAN3%%man/man3/OPENSSL_atexit.3.gz
 %%MAN3%%man/man3/OPENSSL_buf2hexstr.3.gz
 %%MAN3%%man/man3/OPENSSL_cipher_name.3.gz
@@ -2839,6 +2901,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/SSL_get_peer_certificate.3.gz
 %%MAN3%%man/man3/SSL_get_peer_signature_nid.3.gz
 %%MAN3%%man/man3/SSL_get_peer_signature_type_nid.3.gz
+%%MAN3%%man/man3/SSL_get_peer_tmp_key.3.gz
 %%MAN3%%man/man3/SSL_get_pending_cipher.3.gz
 %%MAN3%%man/man3/SSL_get_psk_identity.3.gz
 %%MAN3%%man/man3/SSL_get_psk_identity_hint.3.gz
@@ -2863,6 +2926,8 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/SSL_get_shared_sigalgs.3.gz
 %%MAN3%%man/man3/SSL_get_shutdown.3.gz
 %%MAN3%%man/man3/SSL_get_sigalgs.3.gz
+%%MAN3%%man/man3/SSL_get_signature_nid.3.gz
+%%MAN3%%man/man3/SSL_get_signature_type_nid.3.gz
 %%MAN3%%man/man3/SSL_get_srtp_profiles.3.gz
 %%MAN3%%man/man3/SSL_get_ssl_method.3.gz
 %%MAN3%%man/man3/SSL_get_state.3.gz
@@ -2870,6 +2935,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/SSL_get_timeout.3.gz
 %%MAN3%%man/man3/SSL_get_tlsext_status_ocsp_resp.3.gz
 %%MAN3%%man/man3/SSL_get_tlsext_status_type.3.gz
+%%MAN3%%man/man3/SSL_get_tmp_key.3.gz
 %%MAN3%%man/man3/SSL_get_verify_callback.3.gz
 %%MAN3%%man/man3/SSL_get_verify_depth.3.gz
 %%MAN3%%man/man3/SSL_get_verify_mode.3.gz