MFH: r511808

security/openssl111: Security update to 1.1.1d

 - Fix RC2 and RC4 options [1]
 - Add man7 to API documentation knob MAN3 [1]

PR:		240283 [1]
Submitted by:	adamw
Security:	9e0c6f7a-d46d-11e9-a1c7-b499baebfeaf

Approved by:	ports-secteam (joneum)

4 files changed, 37 insertions, 27 deletions

diff --git a/security/openssl111/Makefile b/security/openssl111/Makefile
index 6912188e17a1..11182937920d 100644
--- a/security/openssl111/Makefile
+++ b/security/openssl111/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openssl
-PORTVERSION=	1.1.1c
+PORTVERSION=	1.1.1d
 CATEGORIES=	security devel
 MASTER_SITES=	https://www.openssl.org/source/ \
 		ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
@@ -66,7 +66,7 @@ GOST_DESC=	GOST (Russian standard)
 HASHES_DESC=	Hash Function Support
 I386_DESC=	i386 (instead of i486+)
 IDEA_DESC=	International Data Encryption Algorithm
-MAN3_DESC=	Install API manpages (section 3)
+MAN3_DESC=	Install API manpages (section 3, 7)
 MD2_DESC=	MD2 (obsolete)
 MD4_DESC=	MD4 (unsafe)
 MDC2_DESC=	MDC-2 (patented, requires DES)
@@ -96,7 +96,7 @@ ${_option:tu}_CONFIGURE_ON=	enable-${_option}
 .endfor
 
 # Upstream default enabled options
-.for _option in aria asm async ct des gost idea md4 mdc2 nextprotoneg \
+.for _option in aria asm async ct des gost idea md4 mdc2 nextprotoneg rc2 rc4 \
 	rfc3779 rmd160 shared sm2 sm3 sm4 sse2 threads tls1 tls1_1 tls1_2
 ${_option:tu}_CONFIGURE_OFF=	no-${_option}
 .endfor
diff --git a/security/openssl111/distinfo b/security/openssl111/distinfo
index 24a7b25412f4..e502f0e44f9c 100644
--- a/security/openssl111/distinfo
+++ b/security/openssl111/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559070548
-SHA256 (openssl-1.1.1c.tar.gz) = f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90
-SIZE (openssl-1.1.1c.tar.gz) = 8864262
+TIMESTAMP = 1568189063
+SHA256 (openssl-1.1.1d.tar.gz) = 1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2
+SIZE (openssl-1.1.1d.tar.gz) = 8845861
diff --git a/security/openssl111/files/extra-patch-util_process__docs.pl b/security/openssl111/files/extra-patch-util_process__docs.pl
index 50887f597e88..d81c00d4656f 100644
--- a/security/openssl111/files/extra-patch-util_process__docs.pl
+++ b/security/openssl111/files/extra-patch-util_process__docs.pl
@@ -5,7 +5,7 @@
  
  unless ($options{section}) {
 -    $options{section} = [ 1, 3, 5, 7 ];
-+    $options{section} = [ 1, 5, 7 ];
++    $options{section} = [ 1, 5 ];
  }
  unless ($options{sourcedir}) {
      $options{sourcedir} = catdir($config{sourcedir}, "doc");
@@ -14,7 +14,7 @@
                         html => ".html" } -> {$options{type}};
          my $generate = { man  => "pod2man --name=$name --section=$podinfo{section} --center=OpenSSL --release=$config{version} \"$podpath\"",
 -                         html => "pod2html \"--podroot=$options{sourcedir}\" --htmldir=$updir --podpath=man1:man3:man5:man7 \"--infile=$podpath\" \"--title=$podname\" --quiet"
-+                         html => "pod2html \"--podroot=$options{sourcedir}\" --htmldir=$updir --podpath=man1:man5:man7 \"--infile=$podpath\" \"--title=$podname\" --quiet"
++                         html => "pod2html \"--podroot=$options{sourcedir}\" --htmldir=$updir --podpath=man1:man5 \"--infile=$podpath\" \"--title=$podname\" --quiet"
                           } -> {$options{type}};
          my $output_dir = catdir($options{destdir}, "man$podinfo{section}");
          my $output_file = $podname . $suffix;
diff --git a/security/openssl111/pkg-plist b/security/openssl111/pkg-plist
index d0d0739083de..1983b830bfd7 100644
--- a/security/openssl111/pkg-plist
+++ b/security/openssl111/pkg-plist
@@ -767,6 +767,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/CRYPTO_mem_leaks.3.gz
 %%MAN3%%man/man3/CRYPTO_mem_leaks_cb.3.gz
 %%MAN3%%man/man3/CRYPTO_mem_leaks_fp.3.gz
+%%MAN3%%man/man3/CRYPTO_memcmp.3.gz
 %%MAN3%%man/man3/CRYPTO_new_ex_data.3.gz
 %%MAN3%%man/man3/CRYPTO_realloc.3.gz
 %%MAN3%%man/man3/CRYPTO_secure_clear_free.3.gz
@@ -3228,6 +3229,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/X509_CRL_add0_revoked.3.gz
 %%MAN3%%man/man3/X509_CRL_add1_ext_i2d.3.gz
 %%MAN3%%man/man3/X509_CRL_add_ext.3.gz
+%%MAN3%%man/man3/X509_CRL_cmp.3.gz
 %%MAN3%%man/man3/X509_CRL_delete_ext.3.gz
 %%MAN3%%man/man3/X509_CRL_digest.3.gz
 %%MAN3%%man/man3/X509_CRL_dup.3.gz
@@ -3248,6 +3250,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/X509_CRL_get_issuer.3.gz
 %%MAN3%%man/man3/X509_CRL_get_signature_nid.3.gz
 %%MAN3%%man/man3/X509_CRL_get_version.3.gz
+%%MAN3%%man/man3/X509_CRL_match.3.gz
 %%MAN3%%man/man3/X509_CRL_new.3.gz
 %%MAN3%%man/man3/X509_CRL_set1_lastUpdate.3.gz
 %%MAN3%%man/man3/X509_CRL_set1_nextUpdate.3.gz
@@ -3312,6 +3315,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/X509_NAME_add_entry_by_NID.3.gz
 %%MAN3%%man/man3/X509_NAME_add_entry_by_OBJ.3.gz
 %%MAN3%%man/man3/X509_NAME_add_entry_by_txt.3.gz
+%%MAN3%%man/man3/X509_NAME_cmp.3.gz
 %%MAN3%%man/man3/X509_NAME_delete_entry.3.gz
 %%MAN3%%man/man3/X509_NAME_digest.3.gz
 %%MAN3%%man/man3/X509_NAME_dup.3.gz
@@ -3513,12 +3517,15 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/X509_check_issued.3.gz
 %%MAN3%%man/man3/X509_check_private_key.3.gz
 %%MAN3%%man/man3/X509_cmp_current_time.3.gz
+%%MAN3%%man/man3/X509_cmp.3.gz
 %%MAN3%%man/man3/X509_cmp_time.3.gz
 %%MAN3%%man/man3/X509_delete_ext.3.gz
 %%MAN3%%man/man3/X509_digest.3.gz
 %%MAN3%%man/man3/X509_dup.3.gz
 %%MAN3%%man/man3/X509_free.3.gz
+%%MAN3%%man/man3/X509_get0_authority_issuer.3.gz
 %%MAN3%%man/man3/X509_get0_authority_key_id.3.gz
+%%MAN3%%man/man3/X509_get0_authority_serial.3.gz
 %%MAN3%%man/man3/X509_get0_extensions.3.gz
 %%MAN3%%man/man3/X509_get0_notAfter.3.gz
 %%MAN3%%man/man3/X509_get0_notBefore.3.gz
@@ -3551,6 +3558,8 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/X509_get_version.3.gz
 %%MAN3%%man/man3/X509_getm_notAfter.3.gz
 %%MAN3%%man/man3/X509_getm_notBefore.3.gz
+%%MAN3%%man/man3/X509_issuer_and_serial_cmp.3.gz
+%%MAN3%%man/man3/X509_issuer_name_cmp.3.gz
 %%MAN3%%man/man3/X509_load_cert_crl_file.3.gz
 %%MAN3%%man/man3/X509_load_cert_file.3.gz
 %%MAN3%%man/man3/X509_load_crl_file.3.gz
@@ -3568,6 +3577,7 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/X509_set_version.3.gz
 %%MAN3%%man/man3/X509_sign.3.gz
 %%MAN3%%man/man3/X509_sign_ctx.3.gz
+%%MAN3%%man/man3/X509_subject_name_cmp.3.gz
 %%MAN3%%man/man3/X509_time_adj.3.gz
 %%MAN3%%man/man3/X509_time_adj_ex.3.gz
 %%MAN3%%man/man3/X509_up_ref.3.gz
@@ -4012,25 +4022,25 @@ man/man1/x509.1.gz
 %%MAN3%%man/man3/ssl_ct_validation_cb.3.gz
 man/man5/config.5.gz
 man/man5/x509v3_config.5.gz
-man/man7/Ed25519.7.gz
-man/man7/Ed448.7.gz
-man/man7/RAND.7.gz
-man/man7/RAND_DRBG.7.gz
-man/man7/RSA-PSS.7.gz
-man/man7/SM2.7.gz
-man/man7/X25519.7.gz
-man/man7/X448.7.gz
-man/man7/bio.7.gz
-man/man7/crypto.7.gz
-man/man7/ct.7.gz
-man/man7/des_modes.7.gz
-man/man7/evp.7.gz
-man/man7/ossl_store.7.gz
-man/man7/ossl_store-file.7.gz
-man/man7/passphrase-encoding.7.gz
-man/man7/scrypt.7.gz
-man/man7/ssl.7.gz
-man/man7/x509.7.gz
+%%MAN3%%man/man7/Ed25519.7.gz
+%%MAN3%%man/man7/Ed448.7.gz
+%%MAN3%%man/man7/RAND.7.gz
+%%MAN3%%man/man7/RAND_DRBG.7.gz
+%%MAN3%%man/man7/RSA-PSS.7.gz
+%%MAN3%%man/man7/SM2.7.gz
+%%MAN3%%man/man7/X25519.7.gz
+%%MAN3%%man/man7/X448.7.gz
+%%MAN3%%man/man7/bio.7.gz
+%%MAN3%%man/man7/crypto.7.gz
+%%MAN3%%man/man7/ct.7.gz
+%%MAN3%%man/man7/des_modes.7.gz
+%%MAN3%%man/man7/evp.7.gz
+%%MAN3%%man/man7/ossl_store.7.gz
+%%MAN3%%man/man7/ossl_store-file.7.gz
+%%MAN3%%man/man7/passphrase-encoding.7.gz
+%%MAN3%%man/man7/scrypt.7.gz
+%%MAN3%%man/man7/ssl.7.gz
+%%MAN3%%man/man7/x509.7.gz
 %%OPENSSLDIR%%/misc/CA.pl
 %%OPENSSLDIR%%/misc/tsget
 @comment %%OPENSSLDIR%%/misc/tsget.pl