5 files changed, 129 insertions, 11 deletions

diff --git a/Mk/bsd.openssl.mk b/Mk/bsd.openssl.mk
index 846475a26e43..8196c1d202ae 100644
--- a/Mk/bsd.openssl.mk
+++ b/Mk/bsd.openssl.mk
@@ -107,7 +107,7 @@ OPENSSL_SHLIBVER?=	${OPENSSL_SHLIBFILE:E}
 
 # try to guess SHLIBVER for libressl
 .if defined(OPENSSL_PORT) && ${OPENSSL_PORT} == security/libressl
-OPENSSL_SHLIBVER?=	32
+OPENSSL_SHLIBVER?=	33
 .endif
 
 # default
diff --git a/security/libressl/Makefile b/security/libressl/Makefile
index b72e5f519f9b..14499bdb6f12 100644
--- a/security/libressl/Makefile
+++ b/security/libressl/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libressl
-PORTVERSION=	2.1.7
+PORTVERSION=	2.2.0
 CATEGORIES=	security devel
 MASTER_SITES=	OPENBSD/LibreSSL
 
diff --git a/security/libressl/distinfo b/security/libressl/distinfo
index 241ed72779c3..da5d9695d029 100644
--- a/security/libressl/distinfo
+++ b/security/libressl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libressl-2.1.7.tar.gz) = 1dc4bfc03fbe14732704291d6d9cb7a3cc70575957c958a7e2d686908e9cdb8f
-SIZE (libressl-2.1.7.tar.gz) = 2866408
+SHA256 (libressl-2.2.0.tar.gz) = 9690d8f38a5d48425395452eeb305b05bb0f560cd96e0ee30f370d4f16563040
+SIZE (libressl-2.2.0.tar.gz) = 2862547
diff --git a/security/libressl/files/patch-include_openssl_opensslv.h b/security/libressl/files/patch-include_openssl_opensslv.h
index 112a36b75881..a8a1a61df77b 100644
--- a/security/libressl/files/patch-include_openssl_opensslv.h
+++ b/security/libressl/files/patch-include_openssl_opensslv.h
@@ -1,11 +1,11 @@
---- include/openssl/opensslv.h.orig	2015-03-08 23:21:45 UTC
+--- include/openssl/opensslv.h.orig	2015-05-23 21:50:16 UTC
 +++ include/openssl/opensslv.h
 @@ -3,7 +3,7 @@
  #define HEADER_OPENSSLV_H
  
  #define LIBRESSL_VERSION_NUMBER	0x20000000L
 -#define OPENSSL_VERSION_NUMBER	0x20000000L
-+#define OPENSSL_VERSION_NUMBER 	0x1000107fL
- #define OPENSSL_VERSION_TEXT	"LibreSSL 2.1.7"
++#define OPENSSL_VERSION_NUMBER	0x1000107fL
+ #define OPENSSL_VERSION_TEXT	"LibreSSL 2.2.0"
  #define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT
  
diff --git a/security/libressl/pkg-plist b/security/libressl/pkg-plist
index 2e107d1f0b07..69fec0918079 100644
--- a/security/libressl/pkg-plist
+++ b/security/libressl/pkg-plist
@@ -62,7 +62,6 @@ include/openssl/ssl2.h
 include/openssl/ssl23.h
 include/openssl/ssl3.h
 include/openssl/stack.h
-include/tls.h
 include/openssl/tls1.h
 include/openssl/ts.h
 include/openssl/txt_db.h
@@ -72,10 +71,11 @@ include/openssl/whrlpool.h
 include/openssl/x509.h
 include/openssl/x509_vfy.h
 include/openssl/x509v3.h
+include/tls.h
 lib/libcrypto.a
 lib/libcrypto.so
-lib/libcrypto.so.32
-lib/libcrypto.so.32.0.0
+lib/libcrypto.so.33
+lib/libcrypto.so.33.0.0
 lib/libssl.a
 lib/libssl.so
 lib/libssl.so.32
@@ -83,7 +83,7 @@ lib/libssl.so.32.0.0
 lib/libtls.a
 lib/libtls.so
 lib/libtls.so.3
-lib/libtls.so.3.0.0
+lib/libtls.so.3.0.1
 libdata/pkgconfig/libcrypto.pc
 libdata/pkgconfig/libssl.pc
 libdata/pkgconfig/libtls.pc
@@ -96,6 +96,7 @@ man/man3/ASN1_STRING_data.3.gz
 man/man3/ASN1_STRING_dup.3.gz
 man/man3/ASN1_STRING_free.3.gz
 man/man3/ASN1_STRING_length.3.gz
+man/man3/ASN1_STRING_length_set.3.gz
 man/man3/ASN1_STRING_new.3.gz
 man/man3/ASN1_STRING_print.3.gz
 man/man3/ASN1_STRING_print_ex.3.gz
@@ -241,6 +242,7 @@ man/man3/BIO_ssl_copy_session_id.3.gz
 man/man3/BIO_ssl_shutdown.3.gz
 man/man3/BIO_tell.3.gz
 man/man3/BIO_vfree.3.gz
+man/man3/BIO_wpending.3.gz
 man/man3/BIO_write.3.gz
 man/man3/BIO_write_filename.3.gz
 man/man3/BN_BLINDING_convert.3.gz
@@ -296,6 +298,7 @@ man/man3/BN_free.3.gz
 man/man3/BN_from_montgomery.3.gz
 man/man3/BN_gcd.3.gz
 man/man3/BN_generate_prime.3.gz
+man/man3/BN_generate_prime_ex.3.gz
 man/man3/BN_get_word.3.gz
 man/man3/BN_hex2bn.3.gz
 man/man3/BN_init.3.gz
@@ -312,16 +315,20 @@ man/man3/BN_lshift.3.gz
 man/man3/BN_lshift1.3.gz
 man/man3/BN_mask_bits.3.gz
 man/man3/BN_mod.3.gz
+man/man3/BN_mod_add.3.gz
 man/man3/BN_mod_exp.3.gz
 man/man3/BN_mod_inverse.3.gz
 man/man3/BN_mod_mul.3.gz
 man/man3/BN_mod_mul_montgomery.3.gz
 man/man3/BN_mod_mul_reciprocal.3.gz
+man/man3/BN_mod_sqr.3.gz
+man/man3/BN_mod_sub.3.gz
 man/man3/BN_mod_word.3.gz
 man/man3/BN_mpi2bn.3.gz
 man/man3/BN_mul.3.gz
 man/man3/BN_mul_word.3.gz
 man/man3/BN_new.3.gz
+man/man3/BN_nnmod.3.gz
 man/man3/BN_num_bits.3.gz
 man/man3/BN_num_bits_word.3.gz
 man/man3/BN_num_bytes.3.gz
@@ -369,6 +376,12 @@ man/man3/CONF_modules_free.3.gz
 man/man3/CONF_modules_load.3.gz
 man/man3/CONF_modules_load_file.3.gz
 man/man3/CONF_modules_unload.3.gz
+man/man3/CRYPTO_THREADID_cmp.3.gz
+man/man3/CRYPTO_THREADID_cpy.3.gz
+man/man3/CRYPTO_THREADID_current.3.gz
+man/man3/CRYPTO_THREADID_get_callback.3.gz
+man/man3/CRYPTO_THREADID_hash.3.gz
+man/man3/CRYPTO_THREADID_set_callback.3.gz
 man/man3/CRYPTO_add.3.gz
 man/man3/CRYPTO_add_lock.3.gz
 man/man3/CRYPTO_destroy_dynlockid.3.gz
@@ -386,7 +399,38 @@ man/man3/CRYPTO_set_id_callback.3.gz
 man/man3/CRYPTO_set_locking_callback.3.gz
 man/man3/CRYPTO_w_lock.3.gz
 man/man3/CRYPTO_w_unlock.3.gz
+man/man3/DES_cbc_cksum.3.gz
+man/man3/DES_cfb64_encrypt.3.gz
+man/man3/DES_cfb_encrypt.3.gz
+man/man3/DES_crypt.3.gz
+man/man3/DES_ecb2_encrypt.3.gz
+man/man3/DES_ecb3_encrypt.3.gz
+man/man3/DES_ecb_encrypt.3.gz
+man/man3/DES_ede2_cbc_encrypt.3.gz
+man/man3/DES_ede2_cfb64_encrypt.3.gz
+man/man3/DES_ede2_ofb64_encrypt.3.gz
+man/man3/DES_ede3_cbc_encrypt.3.gz
+man/man3/DES_ede3_cbcm_encrypt.3.gz
+man/man3/DES_ede3_cfb64_encrypt.3.gz
+man/man3/DES_ede3_ofb64_encrypt.3.gz
+man/man3/DES_enc_read.3.gz
+man/man3/DES_enc_write.3.gz
+man/man3/DES_fcrypt.3.gz
+man/man3/DES_is_weak_key.3.gz
+man/man3/DES_key_sched.3.gz
+man/man3/DES_ncbc_encrypt.3.gz
+man/man3/DES_ofb64_encrypt.3.gz
+man/man3/DES_ofb_encrypt.3.gz
+man/man3/DES_pcbc_encrypt.3.gz
+man/man3/DES_quad_cksum.3.gz
+man/man3/DES_random_key.3.gz
 man/man3/DES_set_key.3.gz
+man/man3/DES_set_key_checked.3.gz
+man/man3/DES_set_key_unchecked.3.gz
+man/man3/DES_set_odd_parity.3.gz
+man/man3/DES_string_to_2keys.3.gz
+man/man3/DES_string_to_key.3.gz
+man/man3/DES_xcbc_encrypt.3.gz
 man/man3/DH_OpenSSL.3.gz
 man/man3/DH_check.3.gz
 man/man3/DH_compute_key.3.gz
@@ -408,8 +452,10 @@ man/man3/DH_size.3.gz
 man/man3/DHparams_print.3.gz
 man/man3/DHparams_print_fp.3.gz
 man/man3/DSA_OpenSSL.3.gz
+man/man3/DSA_SIG_free.3.gz
 man/man3/DSA_SIG_new.3.gz
 man/man3/DSA_do_sign.3.gz
+man/man3/DSA_do_verify.3.gz
 man/man3/DSA_dup_DH.3.gz
 man/man3/DSA_free.3.gz
 man/man3/DSA_generate_key.3.gz
@@ -417,6 +463,7 @@ man/man3/DSA_generate_parameters.3.gz
 man/man3/DSA_generate_parameters_ex.3.gz
 man/man3/DSA_get_default_method.3.gz
 man/man3/DSA_get_default_openssl_method.3.gz
+man/man3/DSA_get_ex_data.3.gz
 man/man3/DSA_get_ex_new_index.3.gz
 man/man3/DSA_new.3.gz
 man/man3/DSA_new_method.3.gz
@@ -424,6 +471,7 @@ man/man3/DSA_print.3.gz
 man/man3/DSA_print_fp.3.gz
 man/man3/DSA_set_default_method.3.gz
 man/man3/DSA_set_default_openssl_method.3.gz
+man/man3/DSA_set_ex_data.3.gz
 man/man3/DSA_set_method.3.gz
 man/man3/DSA_sign.3.gz
 man/man3/DSA_sign_setup.3.gz
@@ -446,6 +494,7 @@ man/man3/ECDSA_set_method.3.gz
 man/man3/ECDSA_sign.3.gz
 man/man3/ECDSA_sign_ex.3.gz
 man/man3/ECDSA_sign_setup.3.gz
+man/man3/ECDSA_size.3.gz
 man/man3/ECDSA_verify.3.gz
 man/man3/ECPKParameters_print.3.gz
 man/man3/ECPKParameters_print_fp.3.gz
@@ -577,11 +626,15 @@ man/man3/ERR_get_error_line.3.gz
 man/man3/ERR_get_error_line_data.3.gz
 man/man3/ERR_get_next_error_library.3.gz
 man/man3/ERR_lib_error_string.3.gz
+man/man3/ERR_load_UI_strings.3.gz
 man/man3/ERR_load_crypto_strings.3.gz
 man/man3/ERR_load_strings.3.gz
 man/man3/ERR_peek_error.3.gz
 man/man3/ERR_peek_error_line.3.gz
 man/man3/ERR_peek_error_line_data.3.gz
+man/man3/ERR_peek_last_error.3.gz
+man/man3/ERR_peek_last_error_line.3.gz
+man/man3/ERR_peek_last_error_line_data.3.gz
 man/man3/ERR_pop_to_mark.3.gz
 man/man3/ERR_print_errors.3.gz
 man/man3/ERR_print_errors_fp.3.gz
@@ -595,15 +648,23 @@ man/man3/EVP_CIPHER_CTX_block_size.3.gz
 man/man3/EVP_CIPHER_CTX_cipher.3.gz
 man/man3/EVP_CIPHER_CTX_cleanup.3.gz
 man/man3/EVP_CIPHER_CTX_ctrl.3.gz
+man/man3/EVP_CIPHER_CTX_flags.3.gz
+man/man3/EVP_CIPHER_CTX_get_app_data.3.gz
+man/man3/EVP_CIPHER_CTX_init.3.gz
 man/man3/EVP_CIPHER_CTX_iv_length.3.gz
 man/man3/EVP_CIPHER_CTX_key_length.3.gz
+man/man3/EVP_CIPHER_CTX_mode.3.gz
 man/man3/EVP_CIPHER_CTX_nid.3.gz
+man/man3/EVP_CIPHER_CTX_set_app_data.3.gz
 man/man3/EVP_CIPHER_CTX_set_key_length.3.gz
+man/man3/EVP_CIPHER_CTX_set_padding.3.gz
 man/man3/EVP_CIPHER_CTX_type.3.gz
 man/man3/EVP_CIPHER_asn1_to_param.3.gz
 man/man3/EVP_CIPHER_block_size.3.gz
+man/man3/EVP_CIPHER_flags.3.gz
 man/man3/EVP_CIPHER_iv_length.3.gz
 man/man3/EVP_CIPHER_key_length.3.gz
+man/man3/EVP_CIPHER_mode.3.gz
 man/man3/EVP_CIPHER_nid.3.gz
 man/man3/EVP_CIPHER_param_to_asn1.3.gz
 man/man3/EVP_CIPHER_type.3.gz
@@ -618,7 +679,9 @@ man/man3/EVP_DecryptInit.3.gz
 man/man3/EVP_DecryptInit_ex.3.gz
 man/man3/EVP_DecryptUpdate.3.gz
 man/man3/EVP_DigestFinal.3.gz
+man/man3/EVP_DigestFinal_ex.3.gz
 man/man3/EVP_DigestInit.3.gz
+man/man3/EVP_DigestInit_ex.3.gz
 man/man3/EVP_DigestSignFinal.3.gz
 man/man3/EVP_DigestSignInit.3.gz
 man/man3/EVP_DigestSignUpdate.3.gz
@@ -631,8 +694,14 @@ man/man3/EVP_EncryptFinal_ex.3.gz
 man/man3/EVP_EncryptInit.3.gz
 man/man3/EVP_EncryptInit_ex.3.gz
 man/man3/EVP_EncryptUpdate.3.gz
+man/man3/EVP_MAX_MD_SIZE.3.gz
 man/man3/EVP_MD_CTX_block_size.3.gz
+man/man3/EVP_MD_CTX_cleanup.3.gz
 man/man3/EVP_MD_CTX_copy.3.gz
+man/man3/EVP_MD_CTX_copy_ex.3.gz
+man/man3/EVP_MD_CTX_create.3.gz
+man/man3/EVP_MD_CTX_destroy.3.gz
+man/man3/EVP_MD_CTX_init.3.gz
 man/man3/EVP_MD_CTX_md.3.gz
 man/man3/EVP_MD_CTX_size.3.gz
 man/man3/EVP_MD_CTX_type.3.gz
@@ -643,7 +712,9 @@ man/man3/EVP_MD_type.3.gz
 man/man3/EVP_OpenFinal.3.gz
 man/man3/EVP_OpenInit.3.gz
 man/man3/EVP_OpenUpdate.3.gz
+man/man3/EVP_PKEVP_PKEY_CTX_set_app_data.3.gz
 man/man3/EVP_PKEY_CTX_ctrl.3.gz
+man/man3/EVP_PKEY_CTX_ctrl_str.3.gz
 man/man3/EVP_PKEY_CTX_dup.3.gz
 man/man3/EVP_PKEY_CTX_free.3.gz
 man/man3/EVP_PKEY_CTX_get_app_data.3.gz
@@ -774,6 +845,10 @@ man/man3/EVP_rc5_32_12_16_ofb.3.gz
 man/man3/EVP_ripemd160.3.gz
 man/man3/EVP_sha.3.gz
 man/man3/EVP_sha1.3.gz
+man/man3/EVP_sha224.3.gz
+man/man3/EVP_sha256.3.gz
+man/man3/EVP_sha384.3.gz
+man/man3/EVP_sha512.3.gz
 man/man3/HMAC.3.gz
 man/man3/HMAC_Final.3.gz
 man/man3/HMAC_Init.3.gz
@@ -812,6 +887,7 @@ man/man3/OpenSSL_add_all_algorithms.3.gz
 man/man3/OpenSSL_add_all_ciphers.3.gz
 man/man3/OpenSSL_add_all_digests.3.gz
 man/man3/OpenSSL_add_ssl_algorithms.3.gz
+man/man3/PEM.3.gz
 man/man3/PEM_read_DHparams.3.gz
 man/man3/PEM_read_DSAPrivateKey.3.gz
 man/man3/PEM_read_DSA_PUBKEY.3.gz
@@ -969,13 +1045,16 @@ man/man3/SSL_CTX_add_extra_chain_cert.3.gz
 man/man3/SSL_CTX_add_session.3.gz
 man/man3/SSL_CTX_callback_ctrl.3.gz
 man/man3/SSL_CTX_check_private_key.3.gz
+man/man3/SSL_CTX_clear_options.3.gz
 man/man3/SSL_CTX_ctrl.3.gz
 man/man3/SSL_CTX_flush_sessions.3.gz
 man/man3/SSL_CTX_free.3.gz
 man/man3/SSL_CTX_get_cert_store.3.gz
 man/man3/SSL_CTX_get_client_CA_list.3.gz
+man/man3/SSL_CTX_get_client_cert_cb.3.gz
 man/man3/SSL_CTX_get_ex_data.3.gz
 man/man3/SSL_CTX_get_ex_new_index.3.gz
+man/man3/SSL_CTX_get_info_callback.3.gz
 man/man3/SSL_CTX_get_max_cert_list.3.gz
 man/man3/SSL_CTX_get_mode.3.gz
 man/man3/SSL_CTX_get_options.3.gz
@@ -1008,6 +1087,7 @@ man/man3/SSL_CTX_sess_set_cache_size.3.gz
 man/man3/SSL_CTX_sess_set_get_cb.3.gz
 man/man3/SSL_CTX_sess_set_new_cb.3.gz
 man/man3/SSL_CTX_sess_set_remove.3.gz
+man/man3/SSL_CTX_sess_set_remove_cb.3.gz
 man/man3/SSL_CTX_sess_timeouts.3.gz
 man/man3/SSL_CTX_sessions.3.gz
 man/man3/SSL_CTX_set_cert_store.3.gz
@@ -1068,6 +1148,7 @@ man/man3/SSL_alert_type_string_long.3.gz
 man/man3/SSL_callback_ctrl.3.gz
 man/man3/SSL_check_private_key.3.gz
 man/man3/SSL_clear.3.gz
+man/man3/SSL_clear_options.3.gz
 man/man3/SSL_connect.3.gz
 man/man3/SSL_ctrl.3.gz
 man/man3/SSL_do_handshake.3.gz
@@ -1076,6 +1157,7 @@ man/man3/SSL_free.3.gz
 man/man3/SSL_get0_session.3.gz
 man/man3/SSL_get1_session.3.gz
 man/man3/SSL_get_SSL_CTX.3.gz
+man/man3/SSL_get_accept_state.3.gz
 man/man3/SSL_get_cipher.3.gz
 man/man3/SSL_get_cipher_bits.3.gz
 man/man3/SSL_get_cipher_list.3.gz
@@ -1090,8 +1172,10 @@ man/man3/SSL_get_ex_data.3.gz
 man/man3/SSL_get_ex_data_X509_STORE_CTX_idx.3.gz
 man/man3/SSL_get_ex_new_index.3.gz
 man/man3/SSL_get_fd.3.gz
+man/man3/SSL_get_info_callback.3.gz
 man/man3/SSL_get_max_cert_list.3.gz
 man/man3/SSL_get_mode.3.gz
+man/man3/SSL_get_msg_callback_arg.3.gz
 man/man3/SSL_get_options.3.gz
 man/man3/SSL_get_peer_cert_chain.3.gz
 man/man3/SSL_get_peer_certificate.3.gz
@@ -1100,6 +1184,7 @@ man/man3/SSL_get_psk_identity_hint.3.gz
 man/man3/SSL_get_quiet_shutdown.3.gz
 man/man3/SSL_get_rbio.3.gz
 man/man3/SSL_get_rfd.3.gz
+man/man3/SSL_get_secure_renegotiation_support.3.gz
 man/man3/SSL_get_session.3.gz
 man/man3/SSL_get_shutdown.3.gz
 man/man3/SSL_get_ssl_method.3.gz
@@ -1112,6 +1197,7 @@ man/man3/SSL_get_verify_result.3.gz
 man/man3/SSL_get_version.3.gz
 man/man3/SSL_get_wbio.3.gz
 man/man3/SSL_get_wfd.3.gz
+man/man3/SSL_has_matching_session_id.3.gz
 man/man3/SSL_library_init.3.gz
 man/man3/SSL_load_client_CA_file.3.gz
 man/man3/SSL_load_error_strings.3.gz
@@ -1130,6 +1216,8 @@ man/man3/SSL_set_client_CA_list.3.gz
 man/man3/SSL_set_connect_state.3.gz
 man/man3/SSL_set_ex_data.3.gz
 man/man3/SSL_set_fd.3.gz
+man/man3/SSL_set_generate_session_id.3.gz
+man/man3/SSL_set_info_callback.3.gz
 man/man3/SSL_set_max_cert_list.3.gz
 man/man3/SSL_set_mode.3.gz
 man/man3/SSL_set_msg_callback.3.gz
@@ -1223,8 +1311,16 @@ man/man3/X509_NAME_add_entry_by_NID.3.gz
 man/man3/X509_NAME_add_entry_by_OBJ.3.gz
 man/man3/X509_NAME_add_entry_by_txt.3.gz
 man/man3/X509_NAME_delete_entry.3.gz
+man/man3/X509_NAME_entry_count.3.gz
+man/man3/X509_NAME_get_entry.3.gz
 man/man3/X509_NAME_get_index_by_NID.3.gz
+man/man3/X509_NAME_get_index_by_OBJ.3.gz
+man/man3/X509_NAME_get_text_by_NID.3.gz
+man/man3/X509_NAME_get_text_by_OBJ.3.gz
+man/man3/X509_NAME_oneline.3.gz
+man/man3/X509_NAME_print.3.gz
 man/man3/X509_NAME_print_ex.3.gz
+man/man3/X509_NAME_print_ex_fp.3.gz
 man/man3/X509_STORE_CTX_cleanup.3.gz
 man/man3/X509_STORE_CTX_free.3.gz
 man/man3/X509_STORE_CTX_get0_param.3.gz
@@ -1261,6 +1357,7 @@ man/man3/X509_free.3.gz
 man/man3/X509_new.3.gz
 man/man3/X509_verify_cert.3.gz
 man/man3/X509_verify_cert_error_string.3.gz
+man/man3/bio_info_cb.3.gz
 man/man3/bn.3.gz
 man/man3/bn_add_words.3.gz
 man/man3/bn_check_top.3.gz
@@ -1292,7 +1389,18 @@ man/man3/bn_sqr_recursive.3.gz
 man/man3/bn_sqr_words.3.gz
 man/man3/bn_sub_words.3.gz
 man/man3/bn_wexpand.3.gz
+man/man3/callback.3.gz
+man/man3/client_cert_cb.3.gz
 man/man3/crypto.3.gz
+man/man3/crypto_dispatch.3.gz
+man/man3/crypto_done.3.gz
+man/man3/crypto_freereq.3.gz
+man/man3/crypto_freesession.3.gz
+man/man3/crypto_get_driverid.3.gz
+man/man3/crypto_getreq.3.gz
+man/man3/crypto_newsession.3.gz
+man/man3/crypto_register.3.gz
+man/man3/crypto_unregister.3.gz
 man/man3/d2i_ASN1_OBJECT.3.gz
 man/man3/d2i_DHparams.3.gz
 man/man3/d2i_DSAPrivateKey.3.gz
@@ -1310,6 +1418,7 @@ man/man3/d2i_PKCS8PrivateKey_bio.3.gz
 man/man3/d2i_PKCS8PrivateKey_fp.3.gz
 man/man3/d2i_RSAPrivateKey.3.gz
 man/man3/d2i_RSAPublicKey.3.gz
+man/man3/d2i_RSA_PUBKEY.3.gz
 man/man3/d2i_SSL_SESSION.3.gz
 man/man3/d2i_X509.3.gz
 man/man3/d2i_X509_ALGOR.3.gz
@@ -1333,6 +1442,7 @@ man/man3/ec.3.gz
 man/man3/ecdsa.3.gz
 man/man3/engine.3.gz
 man/man3/evp.3.gz
+man/man3/get_session_cb.3.gz
 man/man3/i2d_ASN1_OBJECT.3.gz
 man/man3/i2d_CMS_bio_stream.3.gz
 man/man3/i2d_DHparams.3.gz
@@ -1353,6 +1463,7 @@ man/man3/i2d_PKCS8PrivateKey_nid_bio.3.gz
 man/man3/i2d_PKCS8PrivateKey_nid_fp.3.gz
 man/man3/i2d_RSAPrivateKey.3.gz
 man/man3/i2d_RSAPublicKey.3.gz
+man/man3/i2d_RSA_PUBKEY.3.gz
 man/man3/i2d_SSL_SESSION.3.gz
 man/man3/i2d_X509.3.gz
 man/man3/i2d_X509_ALGOR.3.gz
@@ -1363,6 +1474,7 @@ man/man3/i2d_X509_NAME.3.gz
 man/man3/i2d_X509_REQ.3.gz
 man/man3/i2d_X509_REQ_bio.3.gz
 man/man3/i2d_X509_REQ_fp.3.gz
+man/man3/i2d_X509_SIG.3.gz
 man/man3/i2d_X509_bio.3.gz
 man/man3/i2d_X509_fp.3.gz
 man/man3/lh_delete.3.gz
@@ -1382,9 +1494,13 @@ man/man3/lh_stats_bio.3.gz
 man/man3/lhash.3.gz
 man/man3/mul.3.gz
 man/man3/mul_add.3.gz
+man/man3/new_session_cb.3.gz
+man/man3/pem_passwd_cb.3.gz
+man/man3/remove_session_cb.3.gz
 man/man3/rsa.3.gz
 man/man3/sqr.3.gz
 man/man3/ssl.3.gz
+man/man3/tls_accept_fds.3.gz
 man/man3/tls_accept_socket.3.gz
 man/man3/tls_client.3.gz
 man/man3/tls_close.3.gz
@@ -1420,7 +1536,9 @@ man/man3/tls_read.3.gz
 man/man3/tls_reset.3.gz
 man/man3/tls_server.3.gz
 man/man3/tls_write.3.gz
+man/man3/tmp_rsa_callback.3.gz
 man/man3/ui.3.gz
 man/man3/ui_compat.3.gz
+man/man3/verify_callback.3.gz
 man/man3/x509.3.gz
 @dir include/openssl