Merge the remainder of the projects/openssl111 branch to head.

- Update OpenSSL to version 1.1.1.
- Update Kerberos/Heimdal API for OpenSSL 1.1.1 compatibility.
- Bump __FreeBSD_version.

Approved by:	re (kib)
Sponsored by:	The FreeBSD Foundation

1 files changed, 223 insertions, 0 deletions

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 53e3c6104ce5..a5f655a3e9aa 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,229 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20181009: OpenSSL 1.1.1
+OLD_FILES+=usr/include/openssl/des_old.h
+OLD_FILES+=usr/include/openssl/dso.h
+OLD_FILES+=usr/include/openssl/krb5_asn.h
+OLD_FILES+=usr/include/openssl/kssl.h
+OLD_FILES+=usr/include/openssl/pqueue.h
+OLD_FILES+=usr/include/openssl/ssl23.h
+OLD_FILES+=usr/include/openssl/ui_compat.h
+OLD_FILES+=usr/share/openssl/man/man1/dss1.1.gz
+OLD_FILES+=usr/share/openssl/man/man1/md2.1.gz
+OLD_FILES+=usr/share/openssl/man/man1/md4.1.gz
+OLD_FILES+=usr/share/openssl/man/man1/md5.1.gz
+OLD_FILES+=usr/share/openssl/man/man1/mdc2.1.gz
+OLD_FILES+=usr/share/openssl/man/man1/ripemd160.1.gz
+OLD_FILES+=usr/share/openssl/man/man1/sha.1.gz
+OLD_FILES+=usr/share/openssl/man/man1/sha1.1.gz
+OLD_FILES+=usr/share/openssl/man/man1/sha224.1.gz
+OLD_FILES+=usr/share/openssl/man/man1/sha256.1.gz
+OLD_FILES+=usr/share/openssl/man/man1/sha384.1.gz
+OLD_FILES+=usr/share/openssl/man/man1/sha512.1.gz
+OLD_FILES+=usr/share/openssl/man/man1/x509v3_config.1.gz
+OLD_FILES+=usr/share/openssl/man/man3/ASN1_STRING_length_set.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/BIO_get_conn_int_port.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/BIO_get_conn_ip.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/BIO_set.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/BIO_set_conn_int_port.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/BIO_set_conn_ip.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/BN_BLINDING_get_thread_id.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/BN_BLINDING_set_thread_id.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/BN_BLINDING_thread_id.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/BN_CTX_init.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/BN_MONT_CTX_init.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/BN_RECP_CTX_init.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/BN_init.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/BUF_memdup.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/BUF_memdup.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/BUF_strdup.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/BUF_strlcat.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/BUF_strlcpy.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/BUF_strndup.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/CMS_set1_signer_cert.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_cmp.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_cpy.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_current.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_get_callback.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_hash.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_THREADID_set_callback.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_destroy_dynlockid.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_get_new_dynlockid.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_lock.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_num_locks.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_dynlock_create_callback.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_dynlock_destroy_callback.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_dynlock_lock_callback.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/CRYPTO_set_locking_callback.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/DES_ede3_cbcm_encrypt.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/DES_enc_read.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/DES_enc_write.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/EC_KEY_get_key_method_data.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/EC_KEY_insert_key_method_data.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/EC_POINT_set_Jprojective_coordinates.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/ERR_load_UI_strings.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/EVP_CIPHER_CTX_cleanup.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/EVP_CIPHER_CTX_init.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/EVP_MAX_MD_SIZE.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/EVP_MD_CTX_cleanup.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/EVP_MD_CTX_create.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/EVP_MD_CTX_destroy.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/EVP_MD_CTX_init.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEVP_PKEY_CTX_set_app_data.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_CTX_set_rsa_rsa_keygen_bits.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/EVP_PKEY_get_default_digest.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/EVP_dss.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/EVP_dss1.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/EVP_sha.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/HMAC_CTX_cleanup.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/HMAC_CTX_init.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/HMAC_cleanup.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/OPENSSL_ia32cap_loc.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/PEM.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/RAND_SSLeay.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/RSA_PKCS1_SSLeay.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/RSA_null_method.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/SSL.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_get_ex_new_index.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_need_tmp_rsa.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_set_custom_cli_ext.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_set_default_read_ahead.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_set_ecdh_auto.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_set_tmp_rsa.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/SSL_CTX_set_tmp_rsa_callback.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/SSL_SESSION_get_ex_new_index.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/SSL_add_session.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/SSL_flush_sessions.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/SSL_get_accept_state.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/SSL_get_ex_new_index.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/SSL_get_msg_callback_arg.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/SSL_need_tmp_rsa.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/SSL_remove_session.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/SSL_set_ecdh_auto.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/SSL_set_tmp_rsa.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/SSL_set_tmp_rsa_callback.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/SSLeay.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/SSLeay_add_ssl_algorithms.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/SSLeay_version.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/SSLv2_client_method.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/SSLv2_method.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/SSLv2_server_method.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/X509_STORE_CTX_set_chain.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/X509_STORE_CTX_trusted_stack.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bio.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/blowfish.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_add_words.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_check_top.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_cmp_words.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_div_words.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_dump.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_expand.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_expand2.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_fix_top.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_internal.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_mul_add_words.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_mul_comba4.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_mul_comba8.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_mul_high.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_mul_low_normal.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_mul_low_recursive.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_mul_normal.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_mul_part_recursive.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_mul_recursive.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_mul_words.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_print.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_set_high.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_set_low.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_set_max.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_sqr_comba4.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_sqr_comba8.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_sqr_normal.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_sqr_recursive.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_sqr_words.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_sub_words.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/bn_wexpand.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/buffer.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/crypto.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/d2i_ECPKParameters_bio.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/d2i_ECPKParameters_fp.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/d2i_ECPrivate_key.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/d2i_Netscape_RSA.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/d2i_PKCS8PrivateKey.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/d2i_Private_key.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/d2i_X509_bio.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/d2i_X509_fp.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/des.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/des_read_2passwords.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/des_read_password.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/des_read_pw.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/des_read_pw_string.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/dh.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/dsa.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/ec.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/ecdsa.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/engine.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/err.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/evp.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/hmac.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/i2d_ECPKParameters_bio.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/i2d_ECPKParameters_fp.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/i2d_Netscape_RSA.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/i2d_X509_bio.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/i2d_X509_fp.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/lh_delete.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/lh_doall.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/lh_doall_arg.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/lh_error.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/lh_free.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/lh_insert.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/lh_new.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/lh_node_stats.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/lh_node_stats_bio.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/lh_node_usage_stats.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/lh_node_usage_stats_bio.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/lh_retrieve.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/lh_stats.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/lh_stats_bio.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/lhash.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/md5.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/mdc2.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/pem.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/rand.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/rc4.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/ripemd.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/rsa.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/sha.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/ssl.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/threads.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/ui.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/ui_compat.3.gz
+OLD_FILES+=usr/share/openssl/man/man3/x509.3.gz
+OLD_LIBS+=lib/libcrypto.so.8
+OLD_LIBS+=usr/lib/engines/lib4758cca.so
+OLD_LIBS+=usr/lib/engines/libaep.so
+OLD_LIBS+=usr/lib/engines/libatalla.so
+OLD_LIBS+=usr/lib/engines/libcapi.so
+OLD_LIBS+=usr/lib/engines/libchil.so
+OLD_LIBS+=usr/lib/engines/libcswift.so
+OLD_LIBS+=usr/lib/engines/libgost.so
+OLD_LIBS+=usr/lib/engines/libnuron.so
+OLD_LIBS+=usr/lib/engines/libsureware.so
+OLD_LIBS+=usr/lib/engines/libubsec.so
+OLD_LIBS+=usr/lib/libssl.so.8
+OLD_LIBS+=usr/lib32/libcrypto.so.8
+OLD_LIBS+=usr/lib32/lib4758cca.so
+OLD_LIBS+=usr/lib32/libaep.so
+OLD_LIBS+=usr/lib32/libatalla.so
+OLD_LIBS+=usr/lib32/libcapi.so
+OLD_LIBS+=usr/lib32/libchil.so
+OLD_LIBS+=usr/lib32/libcswift.so
+OLD_LIBS+=usr/lib32/libgost.so
+OLD_LIBS+=usr/lib32/libnuron.so
+OLD_LIBS+=usr/lib32/libsureware.so
+OLD_LIBS+=usr/lib32/libubsec.so
+OLD_LIBS+=usr/lib32/libssl.so.8
 # 20180824: libbe(3) SHLIBDIR fixed to reflect correct location
 OLD_LIBS+=usr/lib/libbe.so.1
 # 20180819: Remove deprecated arc4random(3) stir/addrandom interfaces