5 files changed, 82 insertions, 36 deletions

diff --git a/security/libressl/Makefile b/security/libressl/Makefile
index b83f0ca56b54..436500182ae2 100644
--- a/security/libressl/Makefile
+++ b/security/libressl/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libressl
-PORTVERSION=	2.5.5
+PORTVERSION=	2.6.3
 CATEGORIES=	security devel
 MASTER_SITES=	OPENBSD/LibreSSL
 
@@ -23,7 +23,6 @@ CONFLICTS_INSTALL=	libressl-devel-[0-9]* \
 			openssl-[0-9]* \
 			openssl-devel-[0-9]*
 
-MAN3_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-MAN3
 NC_CONFIGURE_ENABLE=	nc
 
 GNU_CONFIGURE=	yes
@@ -35,6 +34,11 @@ CFLAGS+=	-fpic -DPIC -Wl,-rpath,${PREFIX}/lib -Wl,--as-needed
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
+post-patch-MAN3-off:
+	${REINPLACE_CMD} -e 's/^install-man: install-man3/install-man:/' \
+		-e '/$$(MAKE) $$(AM_MAKEFLAGS) install-data-hook/d' \
+		${WRKSRC}/man/Makefile.in
+
 post-install:
 	${RM} -r ${STAGEDIR}/${PREFIX}/etc/ssl/cert.pem
 
diff --git a/security/libressl/distinfo b/security/libressl/distinfo
index 54013702866b..4a764f6ff485 100644
--- a/security/libressl/distinfo
+++ b/security/libressl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499938563
-SHA256 (libressl-2.5.5.tar.gz) = e57f5e3d5842a81fe9351b6e817fcaf0a749ca4ef35a91465edba9e071dce7c4
-SIZE (libressl-2.5.5.tar.gz) = 3283158
+TIMESTAMP = 1510064360
+SHA256 (libressl-2.6.3.tar.gz) = aead6598263171b96970da0d881e616d0813b69b35ebdc5991f87ff2ea7f5c98
+SIZE (libressl-2.6.3.tar.gz) = 3228661
diff --git a/security/libressl/files/extra-patch-MAN3 b/security/libressl/files/extra-patch-MAN3
deleted file mode 100644
index 475668293fda..000000000000
--- a/security/libressl/files/extra-patch-MAN3
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2016-11-15 22:35:43.105912000 +0100
-+++ Makefile.in	2016-11-15 22:35:43.126013000 +0100
-@@ -360,7 +360,7 @@ target_alias = @target_alias@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = crypto ssl tls include apps tests man
-+SUBDIRS = crypto ssl tls include apps tests
- ACLOCAL_AMFLAGS = -I m4
- pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libcrypto.pc libssl.pc libtls.pc openssl.pc
diff --git a/security/libressl/pkg-plist b/security/libressl/pkg-plist
index 9ada0096678e..0744b850bd1c 100644
--- a/security/libressl/pkg-plist
+++ b/security/libressl/pkg-plist
@@ -32,6 +32,7 @@ include/openssl/engine.h
 include/openssl/err.h
 include/openssl/evp.h
 include/openssl/gost.h
+include/openssl/hkdf.h
 include/openssl/hmac.h
 include/openssl/idea.h
 include/openssl/lhash.h
@@ -75,16 +76,16 @@ include/openssl/x509v3.h
 include/tls.h
 lib/libcrypto.a
 lib/libcrypto.so
-lib/libcrypto.so.41
-lib/libcrypto.so.41.0.1
+lib/libcrypto.so.42
+lib/libcrypto.so.42.0.0
 lib/libssl.a
 lib/libssl.so
-lib/libssl.so.43
-lib/libssl.so.43.0.2
+lib/libssl.so.44
+lib/libssl.so.44.0.1
 lib/libtls.a
 lib/libtls.so
-lib/libtls.so.15
-lib/libtls.so.15.0.4
+lib/libtls.so.16
+lib/libtls.so.16.0.1
 libdata/pkgconfig/libcrypto.pc
 libdata/pkgconfig/libssl.pc
 libdata/pkgconfig/libtls.pc
@@ -99,8 +100,13 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/ASN1_BMPSTRING_new.3.gz
 %%MAN3%%man/man3/ASN1_ENUMERATED_free.3.gz
 %%MAN3%%man/man3/ASN1_ENUMERATED_new.3.gz
+%%MAN3%%man/man3/ASN1_GENERALIZEDTIME_adj.3.gz
+%%MAN3%%man/man3/ASN1_GENERALIZEDTIME_check.3.gz
 %%MAN3%%man/man3/ASN1_GENERALIZEDTIME_free.3.gz
 %%MAN3%%man/man3/ASN1_GENERALIZEDTIME_new.3.gz
+%%MAN3%%man/man3/ASN1_GENERALIZEDTIME_print.3.gz
+%%MAN3%%man/man3/ASN1_GENERALIZEDTIME_set.3.gz
+%%MAN3%%man/man3/ASN1_GENERALIZEDTIME_set_string.3.gz
 %%MAN3%%man/man3/ASN1_GENERALSTRING_free.3.gz
 %%MAN3%%man/man3/ASN1_GENERALSTRING_new.3.gz
 %%MAN3%%man/man3/ASN1_IA5STRING_free.3.gz
@@ -115,6 +121,9 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/ASN1_PRINTABLESTRING_new.3.gz
 %%MAN3%%man/man3/ASN1_PRINTABLE_free.3.gz
 %%MAN3%%man/man3/ASN1_PRINTABLE_new.3.gz
+%%MAN3%%man/man3/ASN1_STRING_TABLE_add.3.gz
+%%MAN3%%man/man3/ASN1_STRING_TABLE_cleanup.3.gz
+%%MAN3%%man/man3/ASN1_STRING_TABLE_get.3.gz
 %%MAN3%%man/man3/ASN1_STRING_cmp.3.gz
 %%MAN3%%man/man3/ASN1_STRING_data.3.gz
 %%MAN3%%man/man3/ASN1_STRING_dup.3.gz
@@ -138,6 +147,8 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/ASN1_TIME_print.3.gz
 %%MAN3%%man/man3/ASN1_TIME_set.3.gz
 %%MAN3%%man/man3/ASN1_TIME_set_string.3.gz
+%%MAN3%%man/man3/ASN1_TIME_set_tm.3.gz
+%%MAN3%%man/man3/ASN1_TIME_to_generalizedtime.3.gz
 %%MAN3%%man/man3/ASN1_TYPE_cmp.3.gz
 %%MAN3%%man/man3/ASN1_TYPE_free.3.gz
 %%MAN3%%man/man3/ASN1_TYPE_get.3.gz
@@ -146,8 +157,14 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/ASN1_TYPE_set1.3.gz
 %%MAN3%%man/man3/ASN1_UNIVERSALSTRING_free.3.gz
 %%MAN3%%man/man3/ASN1_UNIVERSALSTRING_new.3.gz
+%%MAN3%%man/man3/ASN1_UTCTIME_adj.3.gz
+%%MAN3%%man/man3/ASN1_UTCTIME_check.3.gz
+%%MAN3%%man/man3/ASN1_UTCTIME_cmp_time_t.3.gz
 %%MAN3%%man/man3/ASN1_UTCTIME_free.3.gz
 %%MAN3%%man/man3/ASN1_UTCTIME_new.3.gz
+%%MAN3%%man/man3/ASN1_UTCTIME_print.3.gz
+%%MAN3%%man/man3/ASN1_UTCTIME_set.3.gz
+%%MAN3%%man/man3/ASN1_UTCTIME_set_string.3.gz
 %%MAN3%%man/man3/ASN1_UTF8STRING_free.3.gz
 %%MAN3%%man/man3/ASN1_UTF8STRING_new.3.gz
 %%MAN3%%man/man3/ASN1_VISIBLESTRING_free.3.gz
@@ -452,6 +469,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/CRYPTO_EX_dup.3.gz
 %%MAN3%%man/man3/CRYPTO_EX_free.3.gz
 %%MAN3%%man/man3/CRYPTO_EX_new.3.gz
+%%MAN3%%man/man3/CRYPTO_MEM_LEAK_CB.3.gz
 %%MAN3%%man/man3/CRYPTO_THREADID_cmp.3.gz
 %%MAN3%%man/man3/CRYPTO_THREADID_cpy.3.gz
 %%MAN3%%man/man3/CRYPTO_THREADID_current.3.gz
@@ -472,6 +490,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/CRYPTO_malloc.3.gz
 %%MAN3%%man/man3/CRYPTO_mem_ctrl.3.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_new_ex_data.3.gz
 %%MAN3%%man/man3/CRYPTO_num_locks.3.gz
@@ -969,10 +988,10 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_dh_paramgen_prime_len.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_dsa_paramgen_bits.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_ec_paramgen_curve_nid.3.gz
+%%MAN3%%man/man3/EVP_PKEY_CTX_set_rsa_keygen_bits.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_rsa_keygen_pubexp.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_rsa_padding.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_rsa_pss_saltlen.3.gz
-%%MAN3%%man/man3/EVP_PKEY_CTX_set_rsa_rsa_keygen_bits.3.gz
 %%MAN3%%man/man3/EVP_PKEY_CTX_set_signature_md.3.gz
 %%MAN3%%man/man3/EVP_PKEY_assign_DH.3.gz
 %%MAN3%%man/man3/EVP_PKEY_assign_DSA.3.gz
@@ -999,6 +1018,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/EVP_PKEY_id.3.gz
 %%MAN3%%man/man3/EVP_PKEY_keygen.3.gz
 %%MAN3%%man/man3/EVP_PKEY_keygen_init.3.gz
+%%MAN3%%man/man3/EVP_PKEY_meth_get0_info.3.gz
 %%MAN3%%man/man3/EVP_PKEY_missing_parameters.3.gz
 %%MAN3%%man/man3/EVP_PKEY_new.3.gz
 %%MAN3%%man/man3/EVP_PKEY_paramgen.3.gz
@@ -1032,8 +1052,8 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/EVP_aead_aes_128_gcm.3.gz
 %%MAN3%%man/man3/EVP_aead_aes_256_gcm.3.gz
 %%MAN3%%man/man3/EVP_aead_chacha20_poly1305.3.gz
-%%MAN3%%man/man3/EVP_aead_chacha20_poly1305_ietf.3.gz
 %%MAN3%%man/man3/EVP_aes_128_cbc.3.gz
+%%MAN3%%man/man3/EVP_aes_128_cbc_hmac_sha1.3.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_ecb.3.gz
@@ -1046,6 +1066,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/EVP_aes_192_gcm.3.gz
 %%MAN3%%man/man3/EVP_aes_192_ofb.3.gz
 %%MAN3%%man/man3/EVP_aes_256_cbc.3.gz
+%%MAN3%%man/man3/EVP_aes_256_cbc_hmac_sha1.3.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_ecb.3.gz
@@ -1099,6 +1120,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/EVP_rc2_ofb.3.gz
 %%MAN3%%man/man3/EVP_rc4.3.gz
 %%MAN3%%man/man3/EVP_rc4_40.3.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_ecb.3.gz
@@ -1241,6 +1263,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/OpenSSL_add_all_ciphers.3.gz
 %%MAN3%%man/man3/OpenSSL_add_all_digests.3.gz
 %%MAN3%%man/man3/OpenSSL_add_ssl_algorithms.3.gz
+%%MAN3%%man/man3/PEM_bytes_read_bio.3.gz
 %%MAN3%%man/man3/PEM_do_header.3.gz
 %%MAN3%%man/man3/PEM_get_EVP_CIPHER_INFO.3.gz
 %%MAN3%%man/man3/PEM_read.3.gz
@@ -1433,12 +1456,10 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/RSA_padding_add_PKCS1_OAEP.3.gz
 %%MAN3%%man/man3/RSA_padding_add_PKCS1_type_1.3.gz
 %%MAN3%%man/man3/RSA_padding_add_PKCS1_type_2.3.gz
-%%MAN3%%man/man3/RSA_padding_add_SSLv23.3.gz
 %%MAN3%%man/man3/RSA_padding_add_none.3.gz
 %%MAN3%%man/man3/RSA_padding_check_PKCS1_OAEP.3.gz
 %%MAN3%%man/man3/RSA_padding_check_PKCS1_type_1.3.gz
 %%MAN3%%man/man3/RSA_padding_check_PKCS1_type_2.3.gz
-%%MAN3%%man/man3/RSA_padding_check_SSLv23.3.gz
 %%MAN3%%man/man3/RSA_padding_check_none.3.gz
 %%MAN3%%man/man3/RSA_print.3.gz
 %%MAN3%%man/man3/RSA_print_fp.3.gz
@@ -1535,6 +1556,10 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_CTX_sess_set_remove_cb.3.gz
 %%MAN3%%man/man3/SSL_CTX_sess_timeouts.3.gz
 %%MAN3%%man/man3/SSL_CTX_sessions.3.gz
+%%MAN3%%man/man3/SSL_CTX_set1_curves.3.gz
+%%MAN3%%man/man3/SSL_CTX_set1_curves_list.3.gz
+%%MAN3%%man/man3/SSL_CTX_set1_groups.3.gz
+%%MAN3%%man/man3/SSL_CTX_set1_groups_list.3.gz
 %%MAN3%%man/man3/SSL_CTX_set1_param.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_alpn_protos.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_alpn_select_cb.3.gz
@@ -1546,11 +1571,14 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_CTX_set_default_passwd_cb.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_default_passwd_cb_userdata.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_default_verify_paths.3.gz
+%%MAN3%%man/man3/SSL_CTX_set_ecdh_auto.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_ex_data.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_generate_session_id.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_info_callback.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_max_cert_list.3.gz
+%%MAN3%%man/man3/SSL_CTX_set_max_proto_version.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_max_send_fragment.3.gz
+%%MAN3%%man/man3/SSL_CTX_set_min_proto_version.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_mode.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_msg_callback.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_msg_callback_arg.3.gz
@@ -1561,11 +1589,15 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_CTX_set_session_id_context.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_ssl_version.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_timeout.3.gz
+%%MAN3%%man/man3/SSL_CTX_set_tlsext_servername_arg.3.gz
+%%MAN3%%man/man3/SSL_CTX_set_tlsext_servername_callback.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_tlsext_status_arg.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_tlsext_status_cb.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_tlsext_ticket_key_cb.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_tmp_dh.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_tmp_dh_callback.3.gz
+%%MAN3%%man/man3/SSL_CTX_set_tmp_ecdh.3.gz
+%%MAN3%%man/man3/SSL_CTX_set_tmp_ecdh_callback.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_tmp_rsa.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_tmp_rsa_callback.3.gz
 %%MAN3%%man/man3/SSL_CTX_set_verify.3.gz
@@ -1582,13 +1614,17 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_CTX_use_certificate_chain_mem.3.gz
 %%MAN3%%man/man3/SSL_CTX_use_certificate_file.3.gz
 %%MAN3%%man/man3/SSL_SESSION_free.3.gz
+%%MAN3%%man/man3/SSL_SESSION_get0_peer.3.gz
+%%MAN3%%man/man3/SSL_SESSION_get_compress_id.3.gz
 %%MAN3%%man/man3/SSL_SESSION_get_ex_data.3.gz
 %%MAN3%%man/man3/SSL_SESSION_get_ex_new_index.3.gz
+%%MAN3%%man/man3/SSL_SESSION_get_id.3.gz
 %%MAN3%%man/man3/SSL_SESSION_get_time.3.gz
 %%MAN3%%man/man3/SSL_SESSION_get_timeout.3.gz
 %%MAN3%%man/man3/SSL_SESSION_new.3.gz
 %%MAN3%%man/man3/SSL_SESSION_print.3.gz
 %%MAN3%%man/man3/SSL_SESSION_print_fp.3.gz
+%%MAN3%%man/man3/SSL_SESSION_set1_id_context.3.gz
 %%MAN3%%man/man3/SSL_SESSION_set_ex_data.3.gz
 %%MAN3%%man/man3/SSL_SESSION_set_time.3.gz
 %%MAN3%%man/man3/SSL_SESSION_set_timeout.3.gz
@@ -1596,7 +1632,6 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_add_client_CA.3.gz
 %%MAN3%%man/man3/SSL_add_dir_cert_subjects_to_stack.3.gz
 %%MAN3%%man/man3/SSL_add_file_cert_subjects_to_stack.3.gz
-%%MAN3%%man/man3/SSL_add_session.3.gz
 %%MAN3%%man/man3/SSL_alert_desc_string.3.gz
 %%MAN3%%man/man3/SSL_alert_desc_string_long.3.gz
 %%MAN3%%man/man3/SSL_alert_type_string.3.gz
@@ -1612,7 +1647,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_do_handshake.3.gz
 %%MAN3%%man/man3/SSL_dup.3.gz
 %%MAN3%%man/man3/SSL_dup_CA_list.3.gz
-%%MAN3%%man/man3/SSL_flush_sessions.3.gz
+%%MAN3%%man/man3/SSL_export_keying_material.3.gz
 %%MAN3%%man/man3/SSL_free.3.gz
 %%MAN3%%man/man3/SSL_get0_alpn_selected.3.gz
 %%MAN3%%man/man3/SSL_get0_session.3.gz
@@ -1645,6 +1680,9 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_get_read_ahead.3.gz
 %%MAN3%%man/man3/SSL_get_rfd.3.gz
 %%MAN3%%man/man3/SSL_get_secure_renegotiation_support.3.gz
+%%MAN3%%man/man3/SSL_get_server_tmp_key.3.gz
+%%MAN3%%man/man3/SSL_get_servername.3.gz
+%%MAN3%%man/man3/SSL_get_servername_type.3.gz
 %%MAN3%%man/man3/SSL_get_session.3.gz
 %%MAN3%%man/man3/SSL_get_shared_ciphers.3.gz
 %%MAN3%%man/man3/SSL_get_shutdown.3.gz
@@ -1675,7 +1713,6 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_peek.3.gz
 %%MAN3%%man/man3/SSL_pending.3.gz
 %%MAN3%%man/man3/SSL_read.3.gz
-%%MAN3%%man/man3/SSL_remove_session.3.gz
 %%MAN3%%man/man3/SSL_renegotiate.3.gz
 %%MAN3%%man/man3/SSL_renegotiate_abbreviated.3.gz
 %%MAN3%%man/man3/SSL_renegotiate_pending.3.gz
@@ -1683,6 +1720,10 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_rstate_string_long.3.gz
 %%MAN3%%man/man3/SSL_select_next_proto.3.gz
 %%MAN3%%man/man3/SSL_session_reused.3.gz
+%%MAN3%%man/man3/SSL_set1_curves.3.gz
+%%MAN3%%man/man3/SSL_set1_curves_list.3.gz
+%%MAN3%%man/man3/SSL_set1_groups.3.gz
+%%MAN3%%man/man3/SSL_set1_groups_list.3.gz
 %%MAN3%%man/man3/SSL_set1_param.3.gz
 %%MAN3%%man/man3/SSL_set_accept_state.3.gz
 %%MAN3%%man/man3/SSL_set_alpn_protos.3.gz
@@ -1690,12 +1731,15 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_set_cipher_list.3.gz
 %%MAN3%%man/man3/SSL_set_client_CA_list.3.gz
 %%MAN3%%man/man3/SSL_set_connect_state.3.gz
+%%MAN3%%man/man3/SSL_set_ecdh_auto.3.gz
 %%MAN3%%man/man3/SSL_set_ex_data.3.gz
 %%MAN3%%man/man3/SSL_set_fd.3.gz
 %%MAN3%%man/man3/SSL_set_generate_session_id.3.gz
 %%MAN3%%man/man3/SSL_set_info_callback.3.gz
 %%MAN3%%man/man3/SSL_set_max_cert_list.3.gz
+%%MAN3%%man/man3/SSL_set_max_proto_version.3.gz
 %%MAN3%%man/man3/SSL_set_max_send_fragment.3.gz
+%%MAN3%%man/man3/SSL_set_min_proto_version.3.gz
 %%MAN3%%man/man3/SSL_set_mode.3.gz
 %%MAN3%%man/man3/SSL_set_msg_callback.3.gz
 %%MAN3%%man/man3/SSL_set_msg_callback_arg.3.gz
@@ -1709,10 +1753,13 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/SSL_set_ssl_method.3.gz
 %%MAN3%%man/man3/SSL_set_time.3.gz
 %%MAN3%%man/man3/SSL_set_timeout.3.gz
+%%MAN3%%man/man3/SSL_set_tlsext_host_name.3.gz
 %%MAN3%%man/man3/SSL_set_tlsext_status_ocsp_resp.3.gz
 %%MAN3%%man/man3/SSL_set_tlsext_status_type.3.gz
 %%MAN3%%man/man3/SSL_set_tmp_dh.3.gz
 %%MAN3%%man/man3/SSL_set_tmp_dh_callback.3.gz
+%%MAN3%%man/man3/SSL_set_tmp_ecdh.3.gz
+%%MAN3%%man/man3/SSL_set_tmp_ecdh_callback.3.gz
 %%MAN3%%man/man3/SSL_set_tmp_rsa.3.gz
 %%MAN3%%man/man3/SSL_set_tmp_rsa_callback.3.gz
 %%MAN3%%man/man3/SSL_set_verify.3.gz
@@ -1831,6 +1878,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/UI_set_result.3.gz
 %%MAN3%%man/man3/USERNOTICE_free.3.gz
 %%MAN3%%man/man3/USERNOTICE_new.3.gz
+%%MAN3%%man/man3/X25519.3.gz
 %%MAN3%%man/man3/X509V3_EXT_d2i.3.gz
 %%MAN3%%man/man3/X509V3_EXT_i2d.3.gz
 %%MAN3%%man/man3/X509V3_add1_i2d.3.gz
@@ -1924,6 +1972,7 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/X509_PUBKEY_set0_param.3.gz
 %%MAN3%%man/man3/X509_REQ_INFO_free.3.gz
 %%MAN3%%man/man3/X509_REQ_INFO_new.3.gz
+%%MAN3%%man/man3/X509_REQ_check_private_key.3.gz
 %%MAN3%%man/man3/X509_REQ_digest.3.gz
 %%MAN3%%man/man3/X509_REQ_free.3.gz
 %%MAN3%%man/man3/X509_REQ_get_pubkey.3.gz
@@ -1996,6 +2045,8 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/X509_check_ip.3.gz
 %%MAN3%%man/man3/X509_check_ip_asc.3.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_time.3.gz
 %%MAN3%%man/man3/X509_delete_ext.3.gz
 %%MAN3%%man/man3/X509_digest.3.gz
@@ -2027,6 +2078,8 @@ man/man1/openssl.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_time_adj.3.gz
+%%MAN3%%man/man3/X509_time_adj_ex.3.gz
 %%MAN3%%man/man3/X509_up_ref.3.gz
 %%MAN3%%man/man3/X509_verify.3.gz
 %%MAN3%%man/man3/X509_verify_cert.3.gz
@@ -2087,7 +2140,6 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/d2i_ASN1_SET_ANY.3.gz
 %%MAN3%%man/man3/d2i_ASN1_T61STRING.3.gz
 %%MAN3%%man/man3/d2i_ASN1_TIME.3.gz
-%%MAN3%%man/man3/d2i_ASN1_TIME_new.3.gz
 %%MAN3%%man/man3/d2i_ASN1_TYPE.3.gz
 %%MAN3%%man/man3/d2i_ASN1_UINTEGER.3.gz
 %%MAN3%%man/man3/d2i_ASN1_UNIVERSALSTRING.3.gz
@@ -2269,7 +2321,6 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/i2d_ASN1_SET_ANY.3.gz
 %%MAN3%%man/man3/i2d_ASN1_T61STRING.3.gz
 %%MAN3%%man/man3/i2d_ASN1_TIME.3.gz
-%%MAN3%%man/man3/i2d_ASN1_TIME_new.3.gz
 %%MAN3%%man/man3/i2d_ASN1_TYPE.3.gz
 %%MAN3%%man/man3/i2d_ASN1_UNIVERSALSTRING.3.gz
 %%MAN3%%man/man3/i2d_ASN1_UTCTIME.3.gz
@@ -2298,8 +2349,6 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/i2d_ECPKParameters.3.gz
 %%MAN3%%man/man3/i2d_ECPKParameters_bio.3.gz
 %%MAN3%%man/man3/i2d_ECPKParameters_fp.3.gz
-%%MAN3%%man/man3/i2d_ECPKPrivateKey_fp.3.gz
-%%MAN3%%man/man3/i2d_ECPK_PUBKEY_fp.3.gz
 %%MAN3%%man/man3/i2d_ECParameters.3.gz
 %%MAN3%%man/man3/i2d_ECPrivateKey.3.gz
 %%MAN3%%man/man3/i2d_ECPrivateKey_bio.3.gz
@@ -2485,8 +2534,10 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/tls_config_set_cert_file.3.gz
 %%MAN3%%man/man3/tls_config_set_cert_mem.3.gz
 %%MAN3%%man/man3/tls_config_set_ciphers.3.gz
+%%MAN3%%man/man3/tls_config_set_crl_file.3.gz
+%%MAN3%%man/man3/tls_config_set_crl_mem.3.gz
 %%MAN3%%man/man3/tls_config_set_dheparams.3.gz
-%%MAN3%%man/man3/tls_config_set_ecdhecurve.3.gz
+%%MAN3%%man/man3/tls_config_set_ecdhecurves.3.gz
 %%MAN3%%man/man3/tls_config_set_key_file.3.gz
 %%MAN3%%man/man3/tls_config_set_key_mem.3.gz
 %%MAN3%%man/man3/tls_config_set_keypair_file.3.gz
@@ -2536,8 +2587,10 @@ man/man1/openssl.1.gz
 %%MAN3%%man/man3/tls_read.3.gz
 %%MAN3%%man/man3/tls_reset.3.gz
 %%MAN3%%man/man3/tls_server.3.gz
+%%MAN3%%man/man3/tls_unload_file.3.gz
 %%MAN3%%man/man3/tls_write.3.gz
-%%MAN3%%man/man3/tmp_rsa_callback.3.gz
 %%MAN3%%man/man3/verify_callback.3.gz
+man/man5/openssl.cnf.5.gz
+man/man5/x509v3.cnf.5.gz
 @dir etc/ssl/certs
 @dir include/openssl
diff --git a/security/libressl/version.mk b/security/libressl/version.mk
index da6be0e59f5a..ae92709dbbf0 100644
--- a/security/libressl/version.mk
+++ b/security/libressl/version.mk
@@ -1 +1 @@
-OPENSSL_SHLIBVER?=	41
+OPENSSL_SHLIBVER?=	42