3 files changed, 56 insertions, 34 deletions

diff --git a/security/openssl-devel/Makefile b/security/openssl-devel/Makefile
index c69ecbaec3e9..d1a74d99c910 100644
--- a/security/openssl-devel/Makefile
+++ b/security/openssl-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	openssl
-DISTVERSION=	3.0.0-alpha6
+DISTVERSION=	3.0.0-alpha7
 CATEGORIES=	security devel
 MASTER_SITES=	https://www.openssl.org/source/ \
 		ftp://ftp.cert.dfn.de/pub/tools/net/openssl/source/
diff --git a/security/openssl-devel/distinfo b/security/openssl-devel/distinfo
index dc71d2457c09..5f9735e065c8 100644
--- a/security/openssl-devel/distinfo
+++ b/security/openssl-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1596741136
-SHA256 (openssl-3.0.0-alpha6.tar.gz) = 1e8143b152f33f76530da2eaedc5d841121ff9e7247a857390cceac6503f482b
-SIZE (openssl-3.0.0-alpha6.tar.gz) = 13963353
+TIMESTAMP = 1603023355
+SHA256 (openssl-3.0.0-alpha7.tar.gz) = 2884219ad2fae614c0f0d57b77af2f0720f32ffa3a569ac70bbf506bd8732298
+SIZE (openssl-3.0.0-alpha7.tar.gz) = 14005200
diff --git a/security/openssl-devel/pkg-plist b/security/openssl-devel/pkg-plist
index 73669d4de9be..d786bd928dd3 100644
--- a/security/openssl-devel/pkg-plist
+++ b/security/openssl-devel/pkg-plist
@@ -31,15 +31,16 @@ include/openssl/configuration.h
 include/openssl/core.h
 include/openssl/core_dispatch.h
 include/openssl/core_names.h
+include/openssl/core_object.h
 include/openssl/crmf.h
 include/openssl/crmferr.h
 include/openssl/crypto.h
 include/openssl/cryptoerr.h
 include/openssl/ct.h
 include/openssl/cterr.h
+include/openssl/decoder.h
+include/openssl/decodererr.h
 include/openssl/des.h
-include/openssl/deserializer.h
-include/openssl/deserializererr.h
 include/openssl/dh.h
 include/openssl/dherr.h
 include/openssl/dsa.h
@@ -51,6 +52,8 @@ include/openssl/ec.h
 include/openssl/ecdh.h
 include/openssl/ecdsa.h
 include/openssl/ecerr.h
+include/openssl/encoder.h
+include/openssl/encodererr.h
 include/openssl/engine.h
 include/openssl/engineerr.h
 include/openssl/err.h
@@ -92,7 +95,6 @@ include/openssl/pkcs7.h
 include/openssl/pkcs7err.h
 include/openssl/provider.h
 include/openssl/rand.h
-include/openssl/rand_drbg.h
 include/openssl/randerr.h
 include/openssl/rc2.h
 include/openssl/rc4.h
@@ -103,8 +105,6 @@ include/openssl/rsaerr.h
 include/openssl/safestack.h
 include/openssl/seed.h
 include/openssl/self_test.h
-include/openssl/serializer.h
-include/openssl/serializererr.h
 include/openssl/sha.h
 include/openssl/srp.h
 include/openssl/srtp.h
@@ -180,7 +180,6 @@ man/man1/openssl-pkey.1.gz
 man/man1/openssl-pkeyparam.1.gz
 man/man1/openssl-pkeyutl.1.gz
 man/man1/openssl-prime.1.gz
-man/man1/openssl-provider.1.gz
 man/man1/openssl-rand.1.gz
 man/man1/openssl-rehash.1.gz
 man/man1/openssl-req.1.gz
@@ -268,12 +267,16 @@ man/man1/tsget.1.gz
 %%MAN3%%man/man3/BN_swap.3.gz
 %%MAN3%%man/man3/BN_zero.3.gz
 %%MAN3%%man/man3/BUF_MEM_new.3.gz
+%%MAN3%%man/man3/CMS_EncryptedData_decrypt.3.gz
+%%MAN3%%man/man3/CMS_EncryptedData_encrypt.3.gz
 %%MAN3%%man/man3/CMS_EnvelopedData_create.3.gz
 %%MAN3%%man/man3/CMS_add0_cert.3.gz
 %%MAN3%%man/man3/CMS_add1_recipient_cert.3.gz
 %%MAN3%%man/man3/CMS_add1_signer.3.gz
 %%MAN3%%man/man3/CMS_compress.3.gz
+%%MAN3%%man/man3/CMS_data_create.3.gz
 %%MAN3%%man/man3/CMS_decrypt.3.gz
+%%MAN3%%man/man3/CMS_digest_create.3.gz
 %%MAN3%%man/man3/CMS_encrypt.3.gz
 %%MAN3%%man/man3/CMS_final.3.gz
 %%MAN3%%man/man3/CMS_get0_RecipientInfos.3.gz
@@ -343,6 +346,7 @@ man/man1/tsget.1.gz
 %%MAN3%%man/man3/EVP_ASYM_CIPHER_free.3.gz
 %%MAN3%%man/man3/EVP_BytesToKey.3.gz
 %%MAN3%%man/man3/EVP_CIPHER_CTX_get_cipher_data.3.gz
+%%MAN3%%man/man3/EVP_CIPHER_CTX_get_iv.3.gz
 %%MAN3%%man/man3/EVP_CIPHER_meth_new.3.gz
 %%MAN3%%man/man3/EVP_DigestInit.3.gz
 %%MAN3%%man/man3/EVP_DigestSignInit.3.gz
@@ -350,6 +354,7 @@ man/man1/tsget.1.gz
 %%MAN3%%man/man3/EVP_EncodeInit.3.gz
 %%MAN3%%man/man3/EVP_EncryptInit.3.gz
 %%MAN3%%man/man3/EVP_KDF.3.gz
+%%MAN3%%man/man3/EVP_KEM_free.3.gz
 %%MAN3%%man/man3/EVP_KEYEXCH_free.3.gz
 %%MAN3%%man/man3/EVP_KEYMGMT.3.gz
 %%MAN3%%man/man3/EVP_MAC.3.gz
@@ -357,6 +362,7 @@ man/man1/tsget.1.gz
 %%MAN3%%man/man3/EVP_OpenInit.3.gz
 %%MAN3%%man/man3/EVP_PKEY_ASN1_METHOD.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_ctrl.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_get0_libctx.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_new.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set1_pbe_pass.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_hkdf_md.3.gz
@@ -367,8 +373,10 @@ man/man1/tsget.1.gz
 %%MAN3%%man/man3/EVP_PKEY_asn1_get_count.3.gz
 %%MAN3%%man/man3/EVP_PKEY_check.3.gz
 %%MAN3%%man/man3/EVP_PKEY_copy_parameters.3.gz
+%%MAN3%%man/man3/EVP_PKEY_decapsulate.3.gz
 %%MAN3%%man/man3/EVP_PKEY_decrypt.3.gz
 %%MAN3%%man/man3/EVP_PKEY_derive.3.gz
+%%MAN3%%man/man3/EVP_PKEY_encapsulate.3.gz
 %%MAN3%%man/man3/EVP_PKEY_encrypt.3.gz
 %%MAN3%%man/man3/EVP_PKEY_fromdata.3.gz
 %%MAN3%%man/man3/EVP_PKEY_gen.3.gz
@@ -420,7 +428,7 @@ man/man1/tsget.1.gz
 %%MAN3%%man/man3/HMAC.3.gz
 %%MAN3%%man/man3/MD5.3.gz
 %%MAN3%%man/man3/MDC2_Init.3.gz
-%%MAN3%%man/man3/NCONF_new_with_libctx.3.gz
+%%MAN3%%man/man3/NCONF_new_ex.3.gz
 %%MAN3%%man/man3/OBJ_nid2obj.3.gz
 %%MAN3%%man/man3/OCSP_REQUEST_new.3.gz
 %%MAN3%%man/man3/OCSP_cert_to_id.3.gz
@@ -429,7 +437,6 @@ man/man1/tsget.1.gz
 %%MAN3%%man/man3/OCSP_response_status.3.gz
 %%MAN3%%man/man3/OCSP_sendreq_new.3.gz
 %%MAN3%%man/man3/OPENSSL_Applink.3.gz
-%%MAN3%%man/man3/OPENSSL_CTX.3.gz
 %%MAN3%%man/man3/OPENSSL_FILE.3.gz
 %%MAN3%%man/man3/OPENSSL_LH_COMPFUNC.3.gz
 %%MAN3%%man/man3/OPENSSL_LH_stats.3.gz
@@ -459,11 +466,16 @@ man/man1/tsget.1.gz
 %%MAN3%%man/man3/OSSL_CRMF_MSG_set1_regCtrl_regToken.3.gz
 %%MAN3%%man/man3/OSSL_CRMF_MSG_set1_regInfo_certReq.3.gz
 %%MAN3%%man/man3/OSSL_CRMF_pbmp_new.3.gz
-%%MAN3%%man/man3/OSSL_DESERIALIZER.3.gz
-%%MAN3%%man/man3/OSSL_DESERIALIZER_CTX.3.gz
-%%MAN3%%man/man3/OSSL_DESERIALIZER_CTX_new_by_EVP_PKEY.3.gz
-%%MAN3%%man/man3/OSSL_DESERIALIZER_from_bio.3.gz
+%%MAN3%%man/man3/OSSL_DECODER.3.gz
+%%MAN3%%man/man3/OSSL_DECODER_CTX.3.gz
+%%MAN3%%man/man3/OSSL_DECODER_CTX_new_by_EVP_PKEY.3.gz
+%%MAN3%%man/man3/OSSL_DECODER_from_bio.3.gz
+%%MAN3%%man/man3/OSSL_ENCODER.3.gz
+%%MAN3%%man/man3/OSSL_ENCODER_CTX.3.gz
+%%MAN3%%man/man3/OSSL_ENCODER_CTX_new_by_EVP_PKEY.3.gz
+%%MAN3%%man/man3/OSSL_ENCODER_to_bio.3.gz
 %%MAN3%%man/man3/OSSL_HTTP_transfer.3.gz
+%%MAN3%%man/man3/OSSL_LIB_CTX.3.gz
 %%MAN3%%man/man3/OSSL_PARAM.3.gz
 %%MAN3%%man/man3/OSSL_PARAM_BLD.3.gz
 %%MAN3%%man/man3/OSSL_PARAM_allocate_from_text.3.gz
@@ -471,10 +483,6 @@ man/man1/tsget.1.gz
 %%MAN3%%man/man3/OSSL_PROVIDER.3.gz
 %%MAN3%%man/man3/OSSL_SELF_TEST_new.3.gz
 %%MAN3%%man/man3/OSSL_SELF_TEST_set_callback.3.gz
-%%MAN3%%man/man3/OSSL_SERIALIZER.3.gz
-%%MAN3%%man/man3/OSSL_SERIALIZER_CTX.3.gz
-%%MAN3%%man/man3/OSSL_SERIALIZER_CTX_new_by_EVP_PKEY.3.gz
-%%MAN3%%man/man3/OSSL_SERIALIZER_to_bio.3.gz
 %%MAN3%%man/man3/OSSL_STORE_INFO.3.gz
 %%MAN3%%man/man3/OSSL_STORE_LOADER.3.gz
 %%MAN3%%man/man3/OSSL_STORE_SEARCH.3.gz
@@ -486,7 +494,7 @@ man/man1/tsget.1.gz
 %%MAN3%%man/man3/OSSL_trace_set_channel.3.gz
 %%MAN3%%man/man3/OpenSSL_add_all_algorithms.3.gz
 %%MAN3%%man/man3/OpenSSL_version.3.gz
-%%MAN3%%man/man3/PEM_X509_INFO_read_bio_with_libctx.3.gz
+%%MAN3%%man/man3/PEM_X509_INFO_read_bio_ex.3.gz
 %%MAN3%%man/man3/PEM_bytes_read_bio.3.gz
 %%MAN3%%man/man3/PEM_read.3.gz
 %%MAN3%%man/man3/PEM_read_CMS.3.gz
@@ -494,10 +502,15 @@ man/man1/tsget.1.gz
 %%MAN3%%man/man3/PEM_read_bio_ex.3.gz
 %%MAN3%%man/man3/PEM_write_bio_CMS_stream.3.gz
 %%MAN3%%man/man3/PEM_write_bio_PKCS7_stream.3.gz
+%%MAN3%%man/man3/PKCS12_SAFEBAG_create_cert.3.gz
 %%MAN3%%man/man3/PKCS12_SAFEBAG_get0_attrs.3.gz
+%%MAN3%%man/man3/PKCS12_SAFEBAG_get1_cert.3.gz
+%%MAN3%%man/man3/PKCS12_add1_attr_by_NID.3.gz
 %%MAN3%%man/man3/PKCS12_add_CSPName_asc.3.gz
+%%MAN3%%man/man3/PKCS12_add_cert.3.gz
 %%MAN3%%man/man3/PKCS12_add_friendlyname_asc.3.gz
 %%MAN3%%man/man3/PKCS12_add_localkeyid.3.gz
+%%MAN3%%man/man3/PKCS12_add_safe.3.gz
 %%MAN3%%man/man3/PKCS12_create.3.gz
 %%MAN3%%man/man3/PKCS12_get_friendlyname.3.gz
 %%MAN3%%man/man3/PKCS12_newpass.3.gz
@@ -505,19 +518,17 @@ man/man1/tsget.1.gz
 %%MAN3%%man/man3/PKCS5_PBKDF2_HMAC.3.gz
 %%MAN3%%man/man3/PKCS7_decrypt.3.gz
 %%MAN3%%man/man3/PKCS7_encrypt.3.gz
+%%MAN3%%man/man3/PKCS7_get_octet_string.3.gz
 %%MAN3%%man/man3/PKCS7_sign.3.gz
 %%MAN3%%man/man3/PKCS7_sign_add_signer.3.gz
+%%MAN3%%man/man3/PKCS7_type_is_other.3.gz
 %%MAN3%%man/man3/PKCS7_verify.3.gz
 %%MAN3%%man/man3/PKCS8_pkey_add1_attr.3.gz
-%%MAN3%%man/man3/RAND_DRBG_generate.3.gz
-%%MAN3%%man/man3/RAND_DRBG_get0_public.3.gz
-%%MAN3%%man/man3/RAND_DRBG_new.3.gz
-%%MAN3%%man/man3/RAND_DRBG_reseed.3.gz
-%%MAN3%%man/man3/RAND_DRBG_set_callbacks.3.gz
 %%MAN3%%man/man3/RAND_add.3.gz
 %%MAN3%%man/man3/RAND_bytes.3.gz
 %%MAN3%%man/man3/RAND_cleanup.3.gz
 %%MAN3%%man/man3/RAND_egd.3.gz
+%%MAN3%%man/man3/RAND_get0_primary.3.gz
 %%MAN3%%man/man3/RAND_load_file.3.gz
 %%MAN3%%man/man3/RAND_set_rand_method.3.gz
 %%MAN3%%man/man3/RC4_set_key.3.gz
@@ -540,8 +551,10 @@ man/man1/tsget.1.gz
 %%MAN3%%man/man3/SCT_print.3.gz
 %%MAN3%%man/man3/SCT_validate.3.gz
 %%MAN3%%man/man3/SHA256_Init.3.gz
+%%MAN3%%man/man3/SMIME_read_ASN1.3.gz
 %%MAN3%%man/man3/SMIME_read_CMS.3.gz
 %%MAN3%%man/man3/SMIME_read_PKCS7.3.gz
+%%MAN3%%man/man3/SMIME_write_ASN1.3.gz
 %%MAN3%%man/man3/SMIME_write_CMS.3.gz
 %%MAN3%%man/man3/SMIME_write_PKCS7.3.gz
 %%MAN3%%man/man3/SRP_Calc_B.3.gz
@@ -710,6 +723,7 @@ man/man1/tsget.1.gz
 %%MAN3%%man/man3/X509_STORE_new.3.gz
 %%MAN3%%man/man3/X509_STORE_set_verify_cb_func.3.gz
 %%MAN3%%man/man3/X509_VERIFY_PARAM_set_flags.3.gz
+%%MAN3%%man/man3/X509_add_cert.3.gz
 %%MAN3%%man/man3/X509_check_ca.3.gz
 %%MAN3%%man/man3/X509_check_host.3.gz
 %%MAN3%%man/man3/X509_check_issued.3.gz
@@ -747,16 +761,19 @@ man/man1/tsget.1.gz
 man/man5/config.5.gz
 man/man5/fips_config.5.gz
 man/man5/x509v3_config.5.gz
+%%MAN3%%man/man7/EVP_ASYM_CIPHER-SM2.7.gz
 %%MAN3%%man/man7/EVP_KDF-HKDF.7.gz
 %%MAN3%%man/man7/EVP_KDF-KB.7.gz
 %%MAN3%%man/man7/EVP_KDF-KRB5KDF.7.gz
 %%MAN3%%man/man7/EVP_KDF-PBKDF2.7.gz
+%%MAN3%%man/man7/EVP_KDF-PKCS12KDF.7.gz
 %%MAN3%%man/man7/EVP_KDF-SCRYPT.7.gz
 %%MAN3%%man/man7/EVP_KDF-SS.7.gz
 %%MAN3%%man/man7/EVP_KDF-SSHKDF.7.gz
 %%MAN3%%man/man7/EVP_KDF-TLS1_PRF.7.gz
 %%MAN3%%man/man7/EVP_KDF-X942.7.gz
 %%MAN3%%man/man7/EVP_KDF-X963.7.gz
+%%MAN3%%man/man7/EVP_KEM-RSA.7.gz
 %%MAN3%%man/man7/EVP_KEYEXCH-DH.7.gz
 %%MAN3%%man/man7/EVP_KEYEXCH-ECDH.7.gz
 %%MAN3%%man/man7/EVP_KEYEXCH-X25519.7.gz
@@ -785,15 +802,19 @@ man/man5/x509v3_config.5.gz
 %%MAN3%%man/man7/EVP_PKEY-DSA.7.gz
 %%MAN3%%man/man7/EVP_PKEY-EC.7.gz
 %%MAN3%%man/man7/EVP_PKEY-FFC.7.gz
+%%MAN3%%man/man7/EVP_PKEY-HMAC.7.gz
 %%MAN3%%man/man7/EVP_PKEY-RSA.7.gz
+%%MAN3%%man/man7/EVP_PKEY-SM2.7.gz
 %%MAN3%%man/man7/EVP_PKEY-X25519.7.gz
 %%MAN3%%man/man7/EVP_RAND-CTR-DRBG.7.gz
 %%MAN3%%man/man7/EVP_RAND-HASH-DRBG.7.gz
 %%MAN3%%man/man7/EVP_RAND-HMAC-DRBG.7.gz
 %%MAN3%%man/man7/EVP_RAND-TEST-RAND.7.gz
+%%MAN3%%man/man7/EVP_RAND.7.gz
 %%MAN3%%man/man7/EVP_SIGNATURE-DSA.7.gz
 %%MAN3%%man/man7/EVP_SIGNATURE-ECDSA.7.gz
 %%MAN3%%man/man7/EVP_SIGNATURE-ED25519.7.gz
+%%MAN3%%man/man7/EVP_SIGNATURE-HMAC.7.gz
 %%MAN3%%man/man7/EVP_SIGNATURE-RSA.7.gz
 %%MAN3%%man/man7/OSSL_PROVIDER-FIPS.7.gz
 %%MAN3%%man/man7/OSSL_PROVIDER-base.7.gz
@@ -801,20 +822,18 @@ man/man5/x509v3_config.5.gz
 %%MAN3%%man/man7/OSSL_PROVIDER-legacy.7.gz
 %%MAN3%%man/man7/OSSL_PROVIDER-null.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/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/openssl-core.h.7.gz
-%%MAN3%%man/man7/openssl-core_dispatch.h.7.gz
-%%MAN3%%man/man7/openssl-core_names.h.7.gz
-%%MAN3%%man/man7/openssl-env.7.gz
-%%MAN3%%man/man7/openssl_user_macros.7.gz
+%%MAN3%%man/man7/%%OPENSSLDIR%%-core.h.7.gz
+%%MAN3%%man/man7/%%OPENSSLDIR%%-core_dispatch.h.7.gz
+%%MAN3%%man/man7/%%OPENSSLDIR%%-core_names.h.7.gz
+%%MAN3%%man/man7/%%OPENSSLDIR%%-env.7.gz
+%%MAN3%%man/man7/%%OPENSSLDIR%%_user_macros.7.gz
 %%MAN3%%man/man7/ossl_store-file.7.gz
 %%MAN3%%man/man7/ossl_store.7.gz
 %%MAN3%%man/man7/passphrase-encoding.7.gz
@@ -823,12 +842,15 @@ man/man5/x509v3_config.5.gz
 %%MAN3%%man/man7/provider-base.7.gz
 %%MAN3%%man/man7/provider-cipher.7.gz
 %%MAN3%%man/man7/provider-digest.7.gz
+%%MAN3%%man/man7/provider-encoder.7.gz
+%%MAN3%%man/man7/provider-kem.7.gz
 %%MAN3%%man/man7/provider-keyexch.7.gz
 %%MAN3%%man/man7/provider-keymgmt.7.gz
 %%MAN3%%man/man7/provider-mac.7.gz
+%%MAN3%%man/man7/provider-object.7.gz
 %%MAN3%%man/man7/provider-rand.7.gz
-%%MAN3%%man/man7/provider-serializer.7.gz
 %%MAN3%%man/man7/provider-signature.7.gz
+%%MAN3%%man/man7/provider-storemgmt.7.gz
 %%MAN3%%man/man7/provider.7.gz
 %%MAN3%%man/man7/proxy-certificates.7.gz
 %%MAN3%%man/man7/ssl.7.gz