summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2026-06-01 14:36:58 -0400
committerJune McEnroe <june@causal.agency>2026-06-01 14:36:58 -0400
commitdcd11ea62fce539d9a50f41a822853239e05727a (patch)
treee54578b730a4719e4bc8a2d20fef267c8db7f22f
parentImport LibreSSL 3.8.1 (diff)
downloadlibretls-dcd11ea62fce539d9a50f41a822853239e05727a.tar.gz
libretls-dcd11ea62fce539d9a50f41a822853239e05727a.zip
Import LibreSSL 3.8.2
-rw-r--r--VERSION2
-rw-r--r--include/Makefile.am1
-rw-r--r--include/compat/time.h8
-rw-r--r--include/compat/unistd.h3
-rw-r--r--m4/check-os-options.m412
-rw-r--r--man/Makefile.am297
-rw-r--r--man/tls_read.315
7 files changed, 225 insertions, 113 deletions
diff --git a/VERSION b/VERSION
index 1693986..0418bab 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-3.8.1
+3.8.2
 
diff --git a/include/Makefile.am b/include/Makefile.am
index 077637d..22819c8 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -10,6 +10,7 @@ noinst_HEADERS += compat/dirent_msvc.h
 noinst_HEADERS += compat/endian.h
 noinst_HEADERS += compat/err.h
 noinst_HEADERS += compat/fcntl.h
+noinst_HEADERS += compat/getopt.h
 noinst_HEADERS += compat/limits.h
 noinst_HEADERS += compat/netdb.h
 noinst_HEADERS += compat/poll.h
diff --git a/include/compat/time.h b/include/compat/time.h
index 540807d..2748521 100644
--- a/include/compat/time.h
+++ b/include/compat/time.h
@@ -3,6 +3,14 @@
  * sys/time.h compatibility shim
  */
 
+#ifndef SIZEOF_TIME_T
+#ifdef SMALL_TIME_T
+#define SIZEOF_TIME_T 4
+#else
+#define SIZEOF_TIME_T 8
+#endif
+#endif
+
 #ifdef _MSC_VER
 #if _MSC_VER >= 1900
 #include <../ucrt/time.h>
diff --git a/include/compat/unistd.h b/include/compat/unistd.h
index 2583a6e..63c07fc 100644
--- a/include/compat/unistd.h
+++ b/include/compat/unistd.h
@@ -23,6 +23,7 @@ ssize_t pwrite(int d, const void *buf, size_t nbytes, off_t offset);
 #include <io.h>
 #include <process.h>
 
+#define STDIN_FILENO    0
 #define STDOUT_FILENO   1
 #define STDERR_FILENO   2
 
@@ -65,7 +66,7 @@ int getentropy(void *buf, size_t buflen);
 #endif
 
 #ifndef HAVE_GETOPT
-#include <getopt.h>
+#include "getopt.h"
 #endif
 
 #ifndef HAVE_GETPAGESIZE
diff --git a/m4/check-os-options.m4 b/m4/check-os-options.m4
index bd38938..c73709d 100644
--- a/m4/check-os-options.m4
+++ b/m4/check-os-options.m4
@@ -61,9 +61,15 @@ char buf[1]; getentropy(buf, 1);
 	*freebsd*)
 		HOST_OS=freebsd
 		HOST_ABI=elf
-		# fork detection missing, weak seed on failure
-		# https://svnweb.freebsd.org/base/head/lib/libc/gen/arc4random.c?revision=268642&view=markup
-		USE_BUILTIN_ARC4RANDOM=yes
+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <sys/param.h>
+#if __FreeBSD_version < 1200000
+        undefined
+#endif
+                       ]], [[]])],
+                       [ USE_BUILTIN_ARC4RANDOM=no ],
+                       [ USE_BUILTIN_ARC4RANDOM=yes ]
+		)
 		AC_SUBST([PROG_LDADD], ['-lthr'])
 		;;
 	*hpux*)
diff --git a/man/Makefile.am b/man/Makefile.am
index 9928e97..7c7bb1a 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -129,6 +129,7 @@ dist_man3_MANS += d2i_SSL_SESSION.3
 dist_man3_MANS += ssl.3
 dist_man3_MANS += ACCESS_DESCRIPTION_new.3
 dist_man3_MANS += AES_encrypt.3
+dist_man3_MANS += ASIdentifiers_new.3
 dist_man3_MANS += ASN1_BIT_STRING_set.3
 dist_man3_MANS += ASN1_INTEGER_get.3
 dist_man3_MANS += ASN1_NULL_new.3
@@ -153,6 +154,7 @@ dist_man3_MANS += ASN1_mbstring_copy.3
 dist_man3_MANS += ASN1_parse_dump.3
 dist_man3_MANS += ASN1_put_object.3
 dist_man3_MANS += ASN1_time_parse.3
+dist_man3_MANS += ASRange_new.3
 dist_man3_MANS += AUTHORITY_KEYID_new.3
 dist_man3_MANS += BASIC_CONSTRAINTS_new.3
 dist_man3_MANS += BF_set_key.3
@@ -288,18 +290,24 @@ dist_man3_MANS += ERR_set_mark.3
 dist_man3_MANS += ESS_SIGNING_CERT_new.3
 dist_man3_MANS += EVP_AEAD_CTX_init.3
 dist_man3_MANS += EVP_BytesToKey.3
+dist_man3_MANS += EVP_CIPHER_CTX_ctrl.3
 dist_man3_MANS += EVP_CIPHER_CTX_get_cipher_data.3
+dist_man3_MANS += EVP_CIPHER_CTX_set_flags.3
 dist_man3_MANS += EVP_CIPHER_do_all.3
 dist_man3_MANS += EVP_CIPHER_meth_new.3
+dist_man3_MANS += EVP_CIPHER_nid.3
 dist_man3_MANS += EVP_DigestInit.3
 dist_man3_MANS += EVP_DigestSignInit.3
 dist_man3_MANS += EVP_DigestVerifyInit.3
 dist_man3_MANS += EVP_EncodeInit.3
 dist_man3_MANS += EVP_EncryptInit.3
+dist_man3_MANS += EVP_MD_CTX_ctrl.3
 dist_man3_MANS += EVP_MD_meth_new.3
+dist_man3_MANS += EVP_MD_nid.3
 dist_man3_MANS += EVP_OpenInit.3
 dist_man3_MANS += EVP_PKCS82PKEY.3
 dist_man3_MANS += EVP_PKEY_CTX_ctrl.3
+dist_man3_MANS += EVP_PKEY_CTX_get_operation.3
 dist_man3_MANS += EVP_PKEY_CTX_new.3
 dist_man3_MANS += EVP_PKEY_CTX_set_hkdf_md.3
 dist_man3_MANS += EVP_PKEY_add1_attr.3
@@ -338,6 +346,7 @@ dist_man3_MANS += EVP_whirlpool.3
 dist_man3_MANS += EXTENDED_KEY_USAGE_new.3
 dist_man3_MANS += GENERAL_NAME_new.3
 dist_man3_MANS += HMAC.3
+dist_man3_MANS += IPAddressRange_new.3
 dist_man3_MANS += MD5.3
 dist_man3_MANS += NAME_CONSTRAINTS_new.3
 dist_man3_MANS += OBJ_NAME_add.3
@@ -507,6 +516,12 @@ dist_man3_MANS += X509_signature_dump.3
 dist_man3_MANS += X509_verify_cert.3
 dist_man3_MANS += X509at_add1_attr.3
 dist_man3_MANS += X509at_get_attr.3
+dist_man3_MANS += X509v3_addr_add_inherit.3
+dist_man3_MANS += X509v3_addr_get_range.3
+dist_man3_MANS += X509v3_addr_inherits.3
+dist_man3_MANS += X509v3_addr_subset.3
+dist_man3_MANS += X509v3_addr_validate_path.3
+dist_man3_MANS += X509v3_asid_add_id_or_range.3
 dist_man3_MANS += X509v3_get_ext_by_NID.3
 dist_man3_MANS += a2d_ASN1_OBJECT.3
 dist_man3_MANS += bn_dump.3
@@ -574,6 +589,9 @@ install-data-hook:
 	ln -sf "AES_encrypt.3" "$(DESTDIR)$(mandir)/man3/AES_decrypt.3"
 	ln -sf "AES_encrypt.3" "$(DESTDIR)$(mandir)/man3/AES_set_decrypt_key.3"
 	ln -sf "AES_encrypt.3" "$(DESTDIR)$(mandir)/man3/AES_set_encrypt_key.3"
+	ln -sf "ASIdentifiers_new.3" "$(DESTDIR)$(mandir)/man3/ASIdentifiers_free.3"
+	ln -sf "ASIdentifiers_new.3" "$(DESTDIR)$(mandir)/man3/d2i_ASIdentifiers.3"
+	ln -sf "ASIdentifiers_new.3" "$(DESTDIR)$(mandir)/man3/i2d_ASIdentifiers.3"
 	ln -sf "ASN1_BIT_STRING_set.3" "$(DESTDIR)$(mandir)/man3/ASN1_BIT_STRING_get_bit.3"
 	ln -sf "ASN1_BIT_STRING_set.3" "$(DESTDIR)$(mandir)/man3/ASN1_BIT_STRING_set_bit.3"
 	ln -sf "ASN1_INTEGER_get.3" "$(DESTDIR)$(mandir)/man3/ASN1_ENUMERATED_get.3"
@@ -705,6 +723,17 @@ install-data-hook:
 	ln -sf "ASN1_put_object.3" "$(DESTDIR)$(mandir)/man3/ASN1_put_eoc.3"
 	ln -sf "ASN1_time_parse.3" "$(DESTDIR)$(mandir)/man3/ASN1_TIME_set_tm.3"
 	ln -sf "ASN1_time_parse.3" "$(DESTDIR)$(mandir)/man3/ASN1_time_tm_cmp.3"
+	ln -sf "ASRange_new.3" "$(DESTDIR)$(mandir)/man3/ASIdOrRange_free.3"
+	ln -sf "ASRange_new.3" "$(DESTDIR)$(mandir)/man3/ASIdOrRange_new.3"
+	ln -sf "ASRange_new.3" "$(DESTDIR)$(mandir)/man3/ASIdentifierChoice_free.3"
+	ln -sf "ASRange_new.3" "$(DESTDIR)$(mandir)/man3/ASIdentifierChoice_new.3"
+	ln -sf "ASRange_new.3" "$(DESTDIR)$(mandir)/man3/ASRange_free.3"
+	ln -sf "ASRange_new.3" "$(DESTDIR)$(mandir)/man3/d2i_ASIdOrRange.3"
+	ln -sf "ASRange_new.3" "$(DESTDIR)$(mandir)/man3/d2i_ASIdentifierChoice.3"
+	ln -sf "ASRange_new.3" "$(DESTDIR)$(mandir)/man3/d2i_ASRange.3"
+	ln -sf "ASRange_new.3" "$(DESTDIR)$(mandir)/man3/i2d_ASIdOrRange.3"
+	ln -sf "ASRange_new.3" "$(DESTDIR)$(mandir)/man3/i2d_ASIdentifierChoice.3"
+	ln -sf "ASRange_new.3" "$(DESTDIR)$(mandir)/man3/i2d_ASRange.3"
 	ln -sf "AUTHORITY_KEYID_new.3" "$(DESTDIR)$(mandir)/man3/AUTHORITY_KEYID_free.3"
 	ln -sf "BASIC_CONSTRAINTS_new.3" "$(DESTDIR)$(mandir)/man3/BASIC_CONSTRAINTS_free.3"
 	ln -sf "BF_set_key.3" "$(DESTDIR)$(mandir)/man3/BF_cbc_encrypt.3"
@@ -1437,8 +1466,23 @@ install-data-hook:
 	ln -sf "EVP_AEAD_CTX_init.3" "$(DESTDIR)$(mandir)/man3/EVP_aead_aes_256_gcm.3"
 	ln -sf "EVP_AEAD_CTX_init.3" "$(DESTDIR)$(mandir)/man3/EVP_aead_chacha20_poly1305.3"
 	ln -sf "EVP_AEAD_CTX_init.3" "$(DESTDIR)$(mandir)/man3/EVP_aead_xchacha20_poly1305.3"
+	ln -sf "EVP_CIPHER_CTX_ctrl.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_get_iv.3"
+	ln -sf "EVP_CIPHER_CTX_ctrl.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_iv_length.3"
+	ln -sf "EVP_CIPHER_CTX_ctrl.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_key_length.3"
+	ln -sf "EVP_CIPHER_CTX_ctrl.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_set_iv.3"
+	ln -sf "EVP_CIPHER_CTX_ctrl.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_set_key_length.3"
+	ln -sf "EVP_CIPHER_CTX_ctrl.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_set_padding.3"
+	ln -sf "EVP_CIPHER_CTX_ctrl.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_iv_length.3"
+	ln -sf "EVP_CIPHER_CTX_ctrl.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_key_length.3"
 	ln -sf "EVP_CIPHER_CTX_get_cipher_data.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_buf_noconst.3"
 	ln -sf "EVP_CIPHER_CTX_get_cipher_data.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_set_cipher_data.3"
+	ln -sf "EVP_CIPHER_CTX_set_flags.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_clear_flags.3"
+	ln -sf "EVP_CIPHER_CTX_set_flags.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_get_app_data.3"
+	ln -sf "EVP_CIPHER_CTX_set_flags.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_rand_key.3"
+	ln -sf "EVP_CIPHER_CTX_set_flags.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_set_app_data.3"
+	ln -sf "EVP_CIPHER_CTX_set_flags.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_test_flags.3"
+	ln -sf "EVP_CIPHER_CTX_set_flags.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_asn1_to_param.3"
+	ln -sf "EVP_CIPHER_CTX_set_flags.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_param_to_asn1.3"
 	ln -sf "EVP_CIPHER_do_all.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_do_all_sorted.3"
 	ln -sf "EVP_CIPHER_do_all.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_do_all.3"
 	ln -sf "EVP_CIPHER_do_all.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_do_all_sorted.3"
@@ -1453,37 +1497,31 @@ install-data-hook:
 	ln -sf "EVP_CIPHER_meth_new.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_meth_set_init.3"
 	ln -sf "EVP_CIPHER_meth_new.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_meth_set_iv_length.3"
 	ln -sf "EVP_CIPHER_meth_new.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_meth_set_set_asn1_params.3"
+	ln -sf "EVP_CIPHER_nid.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_block_size.3"
+	ln -sf "EVP_CIPHER_nid.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_flags.3"
+	ln -sf "EVP_CIPHER_nid.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_mode.3"
+	ln -sf "EVP_CIPHER_nid.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_nid.3"
+	ln -sf "EVP_CIPHER_nid.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_type.3"
+	ln -sf "EVP_CIPHER_nid.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_block_size.3"
+	ln -sf "EVP_CIPHER_nid.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_flags.3"
+	ln -sf "EVP_CIPHER_nid.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_mode.3"
+	ln -sf "EVP_CIPHER_nid.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_name.3"
+	ln -sf "EVP_CIPHER_nid.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_type.3"
 	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_Digest.3"
 	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_DigestFinal.3"
 	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_DigestFinal_ex.3"
 	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_DigestInit_ex.3"
 	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_DigestUpdate.3"
-	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_MAX_MD_SIZE.3"
-	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_block_size.3"
 	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_cleanup.3"
-	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_clear_flags.3"
 	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_copy.3"
 	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_copy_ex.3"
 	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_create.3"
-	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_ctrl.3"
 	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_destroy.3"
 	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_free.3"
 	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_init.3"
 	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_md.3"
-	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_md_data.3"
 	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_new.3"
-	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_pkey_ctx.3"
 	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_reset.3"
-	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_set_flags.3"
-	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_set_pkey_ctx.3"
-	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_size.3"
-	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_test_flags.3"
-	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_type.3"
-	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_block_size.3"
-	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_flags.3"
-	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_pkey_type.3"
-	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_size.3"
-	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_type.3"
 	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_get_digestbyname.3"
 	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_get_digestbynid.3"
 	ln -sf "EVP_DigestInit.3" "$(DESTDIR)$(mandir)/man3/EVP_get_digestbyobj.3"
@@ -1510,41 +1548,14 @@ install-data-hook:
 	ln -sf "EVP_EncodeInit.3" "$(DESTDIR)$(mandir)/man3/EVP_EncodeBlock.3"
 	ln -sf "EVP_EncodeInit.3" "$(DESTDIR)$(mandir)/man3/EVP_EncodeFinal.3"
 	ln -sf "EVP_EncodeInit.3" "$(DESTDIR)$(mandir)/man3/EVP_EncodeUpdate.3"
-	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_block_size.3"
 	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_cipher.3"
 	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_cleanup.3"
-	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_clear_flags.3"
 	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_copy.3"
-	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_ctrl.3"
 	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_encrypting.3"
-	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_flags.3"
 	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_free.3"
-	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_get_app_data.3"
-	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_get_iv.3"
 	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_init.3"
-	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_iv_length.3"
-	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_key_length.3"
-	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_mode.3"
 	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_new.3"
-	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_nid.3"
-	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_rand_key.3"
 	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_reset.3"
-	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_set_app_data.3"
-	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_set_flags.3"
-	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_set_iv.3"
-	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_set_key_length.3"
-	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_set_padding.3"
-	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_test_flags.3"
-	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_type.3"
-	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_asn1_to_param.3"
-	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_block_size.3"
-	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_flags.3"
-	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_iv_length.3"
-	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_key_length.3"
-	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_mode.3"
-	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_nid.3"
-	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_param_to_asn1.3"
-	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_type.3"
 	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_Cipher.3"
 	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CipherFinal.3"
 	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CipherFinal_ex.3"
@@ -1586,6 +1597,12 @@ install-data-hook:
 	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_rc2_cfb64.3"
 	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_rc2_ecb.3"
 	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_rc2_ofb.3"
+	ln -sf "EVP_MD_CTX_ctrl.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_clear_flags.3"
+	ln -sf "EVP_MD_CTX_ctrl.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_md_data.3"
+	ln -sf "EVP_MD_CTX_ctrl.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_pkey_ctx.3"
+	ln -sf "EVP_MD_CTX_ctrl.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_set_flags.3"
+	ln -sf "EVP_MD_CTX_ctrl.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_set_pkey_ctx.3"
+	ln -sf "EVP_MD_CTX_ctrl.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_test_flags.3"
 	ln -sf "EVP_MD_meth_new.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_meth_dup.3"
 	ln -sf "EVP_MD_meth_new.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_meth_free.3"
 	ln -sf "EVP_MD_meth_new.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_meth_set_app_datasize.3"
@@ -1598,6 +1615,15 @@ install-data-hook:
 	ln -sf "EVP_MD_meth_new.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_meth_set_input_blocksize.3"
 	ln -sf "EVP_MD_meth_new.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_meth_set_result_size.3"
 	ln -sf "EVP_MD_meth_new.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_meth_set_update.3"
+	ln -sf "EVP_MD_nid.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_block_size.3"
+	ln -sf "EVP_MD_nid.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_size.3"
+	ln -sf "EVP_MD_nid.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_type.3"
+	ln -sf "EVP_MD_nid.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_block_size.3"
+	ln -sf "EVP_MD_nid.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_flags.3"
+	ln -sf "EVP_MD_nid.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_name.3"
+	ln -sf "EVP_MD_nid.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_pkey_type.3"
+	ln -sf "EVP_MD_nid.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_size.3"
+	ln -sf "EVP_MD_nid.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_type.3"
 	ln -sf "EVP_OpenInit.3" "$(DESTDIR)$(mandir)/man3/EVP_OpenFinal.3"
 	ln -sf "EVP_OpenInit.3" "$(DESTDIR)$(mandir)/man3/EVP_OpenUpdate.3"
 	ln -sf "EVP_PKCS82PKEY.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY2PKCS8.3"
@@ -1622,6 +1648,7 @@ install-data-hook:
 	ln -sf "EVP_PKEY_CTX_ctrl.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_set_ecdh_kdf_outlen.3"
 	ln -sf "EVP_PKEY_CTX_ctrl.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_set_ecdh_kdf_type.3"
 	ln -sf "EVP_PKEY_CTX_ctrl.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_set_signature_md.3"
+	ln -sf "EVP_PKEY_CTX_get_operation.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_get0_pkey.3"
 	ln -sf "EVP_PKEY_CTX_new.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_dup.3"
 	ln -sf "EVP_PKEY_CTX_new.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_free.3"
 	ln -sf "EVP_PKEY_CTX_new.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_new_id.3"
@@ -1661,18 +1688,22 @@ install-data-hook:
 	ln -sf "EVP_PKEY_cmp.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_copy_parameters.3"
 	ln -sf "EVP_PKEY_cmp.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_missing_parameters.3"
 	ln -sf "EVP_PKEY_decrypt.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_decrypt_init.3"
+	ln -sf "EVP_PKEY_derive.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_get0_peerkey.3"
 	ln -sf "EVP_PKEY_derive.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_derive_init.3"
 	ln -sf "EVP_PKEY_derive.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_derive_set_peer.3"
 	ln -sf "EVP_PKEY_encrypt.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_encrypt_init.3"
 	ln -sf "EVP_PKEY_keygen.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_get_app_data.3"
 	ln -sf "EVP_PKEY_keygen.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_get_cb.3"
 	ln -sf "EVP_PKEY_keygen.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_get_keygen_info.3"
+	ln -sf "EVP_PKEY_keygen.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_set0_keygen_info.3"
 	ln -sf "EVP_PKEY_keygen.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_set_app_data.3"
 	ln -sf "EVP_PKEY_keygen.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_set_cb.3"
 	ln -sf "EVP_PKEY_keygen.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_gen_cb.3"
 	ln -sf "EVP_PKEY_keygen.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_keygen_init.3"
 	ln -sf "EVP_PKEY_keygen.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_paramgen.3"
 	ln -sf "EVP_PKEY_keygen.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_paramgen_init.3"
+	ln -sf "EVP_PKEY_meth_new.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_get_data.3"
+	ln -sf "EVP_PKEY_meth_new.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_set_data.3"
 	ln -sf "EVP_PKEY_meth_new.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_meth_add0.3"
 	ln -sf "EVP_PKEY_meth_new.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_meth_copy.3"
 	ln -sf "EVP_PKEY_meth_new.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_meth_find.3"
@@ -1856,6 +1887,21 @@ install-data-hook:
 	ln -sf "HMAC.3" "$(DESTDIR)$(mandir)/man3/HMAC_Init_ex.3"
 	ln -sf "HMAC.3" "$(DESTDIR)$(mandir)/man3/HMAC_Update.3"
 	ln -sf "HMAC.3" "$(DESTDIR)$(mandir)/man3/HMAC_size.3"
+	ln -sf "IPAddressRange_new.3" "$(DESTDIR)$(mandir)/man3/IPAddressChoice_free.3"
+	ln -sf "IPAddressRange_new.3" "$(DESTDIR)$(mandir)/man3/IPAddressChoice_new.3"
+	ln -sf "IPAddressRange_new.3" "$(DESTDIR)$(mandir)/man3/IPAddressFamily_free.3"
+	ln -sf "IPAddressRange_new.3" "$(DESTDIR)$(mandir)/man3/IPAddressFamily_new.3"
+	ln -sf "IPAddressRange_new.3" "$(DESTDIR)$(mandir)/man3/IPAddressOrRange_free.3"
+	ln -sf "IPAddressRange_new.3" "$(DESTDIR)$(mandir)/man3/IPAddressOrRange_new.3"
+	ln -sf "IPAddressRange_new.3" "$(DESTDIR)$(mandir)/man3/IPAddressRange_free.3"
+	ln -sf "IPAddressRange_new.3" "$(DESTDIR)$(mandir)/man3/d2i_IPAddressChoice.3"
+	ln -sf "IPAddressRange_new.3" "$(DESTDIR)$(mandir)/man3/d2i_IPAddressFamily.3"
+	ln -sf "IPAddressRange_new.3" "$(DESTDIR)$(mandir)/man3/d2i_IPAddressOrRange.3"
+	ln -sf "IPAddressRange_new.3" "$(DESTDIR)$(mandir)/man3/d2i_IPAddressRange.3"
+	ln -sf "IPAddressRange_new.3" "$(DESTDIR)$(mandir)/man3/i2d_IPAddressChoice.3"
+	ln -sf "IPAddressRange_new.3" "$(DESTDIR)$(mandir)/man3/i2d_IPAddressFamily.3"
+	ln -sf "IPAddressRange_new.3" "$(DESTDIR)$(mandir)/man3/i2d_IPAddressOrRange.3"
+	ln -sf "IPAddressRange_new.3" "$(DESTDIR)$(mandir)/man3/i2d_IPAddressRange.3"
 	ln -sf "MD5.3" "$(DESTDIR)$(mandir)/man3/MD4.3"
 	ln -sf "MD5.3" "$(DESTDIR)$(mandir)/man3/MD4_Final.3"
 	ln -sf "MD5.3" "$(DESTDIR)$(mandir)/man3/MD4_Init.3"
@@ -1992,6 +2038,7 @@ install-data-hook:
 	ln -sf "OpenSSL_add_all_algorithms.3" "$(DESTDIR)$(mandir)/man3/EVP_cleanup.3"
 	ln -sf "OpenSSL_add_all_algorithms.3" "$(DESTDIR)$(mandir)/man3/OpenSSL_add_all_ciphers.3"
 	ln -sf "OpenSSL_add_all_algorithms.3" "$(DESTDIR)$(mandir)/man3/OpenSSL_add_all_digests.3"
+	ln -sf "OpenSSL_add_all_algorithms.3" "$(DESTDIR)$(mandir)/man3/SSLeay_add_all_algorithms.3"
 	ln -sf "PEM_ASN1_read.3" "$(DESTDIR)$(mandir)/man3/PEM_ASN1_read_bio.3"
 	ln -sf "PEM_ASN1_read.3" "$(DESTDIR)$(mandir)/man3/d2i_of_void.3"
 	ln -sf "PEM_X509_INFO_read.3" "$(DESTDIR)$(mandir)/man3/PEM_X509_INFO_read_bio.3"
@@ -2178,9 +2225,6 @@ install-data-hook:
 	ln -sf "RSA_get0_key.3" "$(DESTDIR)$(mandir)/man3/RSA_set0_key.3"
 	ln -sf "RSA_get0_key.3" "$(DESTDIR)$(mandir)/man3/RSA_set_flags.3"
 	ln -sf "RSA_get0_key.3" "$(DESTDIR)$(mandir)/man3/RSA_test_flags.3"
-	ln -sf "RSA_get_ex_new_index.3" "$(DESTDIR)$(mandir)/man3/CRYPTO_EX_dup.3"
-	ln -sf "RSA_get_ex_new_index.3" "$(DESTDIR)$(mandir)/man3/CRYPTO_EX_free.3"
-	ln -sf "RSA_get_ex_new_index.3" "$(DESTDIR)$(mandir)/man3/CRYPTO_EX_new.3"
 	ln -sf "RSA_get_ex_new_index.3" "$(DESTDIR)$(mandir)/man3/RSA_get_ex_data.3"
 	ln -sf "RSA_get_ex_new_index.3" "$(DESTDIR)$(mandir)/man3/RSA_set_ex_data.3"
 	ln -sf "RSA_meth_new.3" "$(DESTDIR)$(mandir)/man3/RSA_meth_dup.3"
@@ -2247,6 +2291,8 @@ install-data-hook:
 	ln -sf "RSA_print.3" "$(DESTDIR)$(mandir)/man3/DSAparams_print_fp.3"
 	ln -sf "RSA_print.3" "$(DESTDIR)$(mandir)/man3/RSA_print_fp.3"
 	ln -sf "RSA_private_encrypt.3" "$(DESTDIR)$(mandir)/man3/RSA_public_decrypt.3"
+	ln -sf "RSA_public_encrypt.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_decrypt_old.3"
+	ln -sf "RSA_public_encrypt.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_encrypt_old.3"
 	ln -sf "RSA_public_encrypt.3" "$(DESTDIR)$(mandir)/man3/RSA_private_decrypt.3"
 	ln -sf "RSA_security_bits.3" "$(DESTDIR)$(mandir)/man3/BN_security_bits.3"
 	ln -sf "RSA_security_bits.3" "$(DESTDIR)$(mandir)/man3/DH_security_bits.3"
@@ -2382,7 +2428,6 @@ install-data-hook:
 	ln -sf "SSL_CTX_set_default_passwd_cb.3" "$(DESTDIR)$(mandir)/man3/SSL_CTX_get_default_passwd_cb.3"
 	ln -sf "SSL_CTX_set_default_passwd_cb.3" "$(DESTDIR)$(mandir)/man3/SSL_CTX_get_default_passwd_cb_userdata.3"
 	ln -sf "SSL_CTX_set_default_passwd_cb.3" "$(DESTDIR)$(mandir)/man3/SSL_CTX_set_default_passwd_cb_userdata.3"
-	ln -sf "SSL_CTX_set_default_passwd_cb.3" "$(DESTDIR)$(mandir)/man3/pem_password_cb.3"
 	ln -sf "SSL_CTX_set_generate_session_id.3" "$(DESTDIR)$(mandir)/man3/GEN_SESSION_CB.3"
 	ln -sf "SSL_CTX_set_generate_session_id.3" "$(DESTDIR)$(mandir)/man3/SSL_has_matching_session_id.3"
 	ln -sf "SSL_CTX_set_generate_session_id.3" "$(DESTDIR)$(mandir)/man3/SSL_set_generate_session_id.3"
@@ -3014,6 +3059,19 @@ install-data-hook:
 	ln -sf "X509at_get_attr.3" "$(DESTDIR)$(mandir)/man3/X509at_get_attr_by_NID.3"
 	ln -sf "X509at_get_attr.3" "$(DESTDIR)$(mandir)/man3/X509at_get_attr_by_OBJ.3"
 	ln -sf "X509at_get_attr.3" "$(DESTDIR)$(mandir)/man3/X509at_get_attr_count.3"
+	ln -sf "X509v3_addr_add_inherit.3" "$(DESTDIR)$(mandir)/man3/X509v3_addr_add_prefix.3"
+	ln -sf "X509v3_addr_add_inherit.3" "$(DESTDIR)$(mandir)/man3/X509v3_addr_add_range.3"
+	ln -sf "X509v3_addr_add_inherit.3" "$(DESTDIR)$(mandir)/man3/X509v3_addr_canonize.3"
+	ln -sf "X509v3_addr_add_inherit.3" "$(DESTDIR)$(mandir)/man3/X509v3_addr_is_canonical.3"
+	ln -sf "X509v3_addr_get_range.3" "$(DESTDIR)$(mandir)/man3/X509v3_addr_get_afi.3"
+	ln -sf "X509v3_addr_inherits.3" "$(DESTDIR)$(mandir)/man3/X509v3_asid_inherits.3"
+	ln -sf "X509v3_addr_subset.3" "$(DESTDIR)$(mandir)/man3/X509v3_asid_subset.3"
+	ln -sf "X509v3_addr_validate_path.3" "$(DESTDIR)$(mandir)/man3/X509v3_addr_validate_resource_set.3"
+	ln -sf "X509v3_addr_validate_path.3" "$(DESTDIR)$(mandir)/man3/X509v3_asid_validate_path.3"
+	ln -sf "X509v3_addr_validate_path.3" "$(DESTDIR)$(mandir)/man3/X509v3_asid_validate_resource_set.3"
+	ln -sf "X509v3_asid_add_id_or_range.3" "$(DESTDIR)$(mandir)/man3/X509v3_asid_add_inherit.3"
+	ln -sf "X509v3_asid_add_id_or_range.3" "$(DESTDIR)$(mandir)/man3/X509v3_asid_canonize.3"
+	ln -sf "X509v3_asid_add_id_or_range.3" "$(DESTDIR)$(mandir)/man3/X509v3_asid_is_canonical.3"
 	ln -sf "X509v3_get_ext_by_NID.3" "$(DESTDIR)$(mandir)/man3/X509_CRL_add_ext.3"
 	ln -sf "X509v3_get_ext_by_NID.3" "$(DESTDIR)$(mandir)/man3/X509_CRL_delete_ext.3"
 	ln -sf "X509v3_get_ext_by_NID.3" "$(DESTDIR)$(mandir)/man3/X509_CRL_get_ext.3"
@@ -3384,9 +3442,10 @@ install-data-hook:
 	ln -sf "d2i_X509_SIG.3" "$(DESTDIR)$(mandir)/man3/i2d_PKCS8_bio.3"
 	ln -sf "d2i_X509_SIG.3" "$(DESTDIR)$(mandir)/man3/i2d_PKCS8_fp.3"
 	ln -sf "d2i_X509_SIG.3" "$(DESTDIR)$(mandir)/man3/i2d_X509_SIG.3"
+	ln -sf "des_read_pw.3" "$(DESTDIR)$(mandir)/man3/EVP_get_pw_prompt.3"
 	ln -sf "des_read_pw.3" "$(DESTDIR)$(mandir)/man3/EVP_read_pw_string.3"
 	ln -sf "des_read_pw.3" "$(DESTDIR)$(mandir)/man3/EVP_read_pw_string_min.3"
-	ln -sf "des_read_pw.3" "$(DESTDIR)$(mandir)/man3/des_read_pw_string.3"
+	ln -sf "des_read_pw.3" "$(DESTDIR)$(mandir)/man3/EVP_set_pw_prompt.3"
 	ln -sf "i2a_ASN1_STRING.3" "$(DESTDIR)$(mandir)/man3/a2i_ASN1_ENUMERATED.3"
 	ln -sf "i2a_ASN1_STRING.3" "$(DESTDIR)$(mandir)/man3/a2i_ASN1_INTEGER.3"
 	ln -sf "i2a_ASN1_STRING.3" "$(DESTDIR)$(mandir)/man3/a2i_ASN1_STRING.3"
@@ -3490,7 +3549,6 @@ install-data-hook:
 	ln -sf "tls_read.3" "$(DESTDIR)$(mandir)/man3/tls_close.3"
 	ln -sf "tls_read.3" "$(DESTDIR)$(mandir)/man3/tls_error.3"
 	ln -sf "tls_read.3" "$(DESTDIR)$(mandir)/man3/tls_handshake.3"
-	ln -sf "tls_read.3" "$(DESTDIR)$(mandir)/man3/tls_reset.3"
 	ln -sf "tls_read.3" "$(DESTDIR)$(mandir)/man3/tls_write.3"
 	ln -sf "x509_verify.3" "$(DESTDIR)$(mandir)/man3/x509_verify_ctx_chain.3"
 	ln -sf "x509_verify.3" "$(DESTDIR)$(mandir)/man3/x509_verify_ctx_error_depth.3"
@@ -3511,6 +3569,9 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/AES_decrypt.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/AES_set_decrypt_key.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/AES_set_encrypt_key.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/ASIdentifiers_free.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/d2i_ASIdentifiers.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/i2d_ASIdentifiers.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ASN1_BIT_STRING_get_bit.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ASN1_BIT_STRING_set_bit.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ASN1_ENUMERATED_get.3"
@@ -3642,6 +3703,17 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/ASN1_put_eoc.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ASN1_TIME_set_tm.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ASN1_time_tm_cmp.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/ASIdOrRange_free.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/ASIdOrRange_new.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/ASIdentifierChoice_free.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/ASIdentifierChoice_new.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/ASRange_free.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/d2i_ASIdOrRange.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/d2i_ASIdentifierChoice.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/d2i_ASRange.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/i2d_ASIdOrRange.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/i2d_ASIdentifierChoice.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/i2d_ASRange.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/AUTHORITY_KEYID_free.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/BASIC_CONSTRAINTS_free.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/BF_cbc_encrypt.3"
@@ -4374,8 +4446,23 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_aead_aes_256_gcm.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_aead_chacha20_poly1305.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_aead_xchacha20_poly1305.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_get_iv.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_iv_length.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_key_length.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_set_iv.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_set_key_length.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_set_padding.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_iv_length.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_key_length.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_buf_noconst.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_set_cipher_data.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_clear_flags.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_get_app_data.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_rand_key.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_set_app_data.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_test_flags.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_asn1_to_param.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_param_to_asn1.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_do_all_sorted.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_do_all.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_do_all_sorted.3"
@@ -4390,37 +4477,31 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_meth_set_init.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_meth_set_iv_length.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_meth_set_set_asn1_params.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_block_size.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_flags.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_mode.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_nid.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_type.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_block_size.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_flags.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_mode.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_name.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_type.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_Digest.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_DigestFinal.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_DigestFinal_ex.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_DigestInit_ex.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_DigestUpdate.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MAX_MD_SIZE.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_block_size.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_cleanup.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_clear_flags.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_copy.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_copy_ex.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_create.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_ctrl.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_destroy.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_free.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_init.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_md.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_md_data.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_new.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_pkey_ctx.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_reset.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_set_flags.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_set_pkey_ctx.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_size.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_test_flags.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_type.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_block_size.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_flags.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_pkey_type.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_size.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_type.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_get_digestbyname.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_get_digestbynid.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_get_digestbyobj.3"
@@ -4447,41 +4528,14 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_EncodeBlock.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_EncodeFinal.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_EncodeUpdate.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_block_size.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_cipher.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_cleanup.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_clear_flags.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_copy.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_ctrl.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_encrypting.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_flags.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_free.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_get_app_data.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_get_iv.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_init.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_iv_length.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_key_length.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_mode.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_new.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_nid.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_rand_key.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_reset.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_set_app_data.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_set_flags.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_set_iv.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_set_key_length.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_set_padding.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_test_flags.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_type.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_asn1_to_param.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_block_size.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_flags.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_iv_length.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_key_length.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_mode.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_nid.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_param_to_asn1.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_type.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_Cipher.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CipherFinal.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CipherFinal_ex.3"
@@ -4523,6 +4577,12 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_rc2_cfb64.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_rc2_ecb.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_rc2_ofb.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_clear_flags.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_md_data.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_pkey_ctx.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_set_flags.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_set_pkey_ctx.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_test_flags.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_meth_dup.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_meth_free.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_meth_set_app_datasize.3"
@@ -4535,6 +4595,15 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_meth_set_input_blocksize.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_meth_set_result_size.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_meth_set_update.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_block_size.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_size.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_CTX_type.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_block_size.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_flags.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_name.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_pkey_type.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_size.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_type.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_OpenFinal.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_OpenUpdate.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY2PKCS8.3"
@@ -4559,6 +4628,7 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_set_ecdh_kdf_outlen.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_set_ecdh_kdf_type.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_set_signature_md.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_get0_pkey.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_dup.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_free.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_new_id.3"
@@ -4598,18 +4668,22 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_copy_parameters.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_missing_parameters.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_decrypt_init.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_get0_peerkey.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_derive_init.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_derive_set_peer.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_encrypt_init.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_get_app_data.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_get_cb.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_get_keygen_info.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_set0_keygen_info.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_set_app_data.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_set_cb.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_gen_cb.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_keygen_init.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_paramgen.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_paramgen_init.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_get_data.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_CTX_set_data.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_meth_add0.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_meth_copy.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_meth_find.3"
@@ -4793,6 +4867,21 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/HMAC_Init_ex.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/HMAC_Update.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/HMAC_size.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/IPAddressChoice_free.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/IPAddressChoice_new.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/IPAddressFamily_free.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/IPAddressFamily_new.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/IPAddressOrRange_free.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/IPAddressOrRange_new.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/IPAddressRange_free.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/d2i_IPAddressChoice.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/d2i_IPAddressFamily.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/d2i_IPAddressOrRange.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/d2i_IPAddressRange.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/i2d_IPAddressChoice.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/i2d_IPAddressFamily.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/i2d_IPAddressOrRange.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/i2d_IPAddressRange.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/MD4.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/MD4_Final.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/MD4_Init.3"
@@ -4929,6 +5018,7 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_cleanup.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/OpenSSL_add_all_ciphers.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/OpenSSL_add_all_digests.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/SSLeay_add_all_algorithms.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/PEM_ASN1_read_bio.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/d2i_of_void.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/PEM_X509_INFO_read_bio.3"
@@ -5115,9 +5205,6 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/RSA_set0_key.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/RSA_set_flags.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/RSA_test_flags.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/CRYPTO_EX_dup.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/CRYPTO_EX_free.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/CRYPTO_EX_new.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/RSA_get_ex_data.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/RSA_set_ex_data.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/RSA_meth_dup.3"
@@ -5184,6 +5271,8 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/DSAparams_print_fp.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/RSA_print_fp.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/RSA_public_decrypt.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_decrypt_old.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_encrypt_old.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/RSA_private_decrypt.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/BN_security_bits.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/DH_security_bits.3"
@@ -5319,7 +5408,6 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/SSL_CTX_get_default_passwd_cb.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/SSL_CTX_get_default_passwd_cb_userdata.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/SSL_CTX_set_default_passwd_cb_userdata.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/pem_password_cb.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/GEN_SESSION_CB.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/SSL_has_matching_session_id.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/SSL_set_generate_session_id.3"
@@ -5951,6 +6039,19 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/X509at_get_attr_by_NID.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/X509at_get_attr_by_OBJ.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/X509at_get_attr_count.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/X509v3_addr_add_prefix.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/X509v3_addr_add_range.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/X509v3_addr_canonize.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/X509v3_addr_is_canonical.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/X509v3_addr_get_afi.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/X509v3_asid_inherits.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/X509v3_asid_subset.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/X509v3_addr_validate_resource_set.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/X509v3_asid_validate_path.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/X509v3_asid_validate_resource_set.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/X509v3_asid_add_inherit.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/X509v3_asid_canonize.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/X509v3_asid_is_canonical.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/X509_CRL_add_ext.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/X509_CRL_delete_ext.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/X509_CRL_get_ext.3"
@@ -6321,9 +6422,10 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/i2d_PKCS8_bio.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/i2d_PKCS8_fp.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/i2d_X509_SIG.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_get_pw_prompt.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_read_pw_string.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_read_pw_string_min.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/des_read_pw_string.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_set_pw_prompt.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/a2i_ASN1_ENUMERATED.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/a2i_ASN1_INTEGER.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/a2i_ASN1_STRING.3"
@@ -6427,7 +6529,6 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/tls_close.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/tls_error.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/tls_handshake.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/tls_reset.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/tls_write.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/x509_verify_ctx_chain.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/x509_verify_ctx_error_depth.3"
diff --git a/man/tls_read.3 b/man/tls_read.3
index d928975..f9d949e 100644
--- a/man/tls_read.3
+++ b/man/tls_read.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tls_read.3,v 1.7 2019/07/09 17:58:33 jsing Exp $
+.\" $OpenBSD: tls_read.3,v 1.8 2023/09/18 17:25:15 schwarze Exp $
 .\"
 .\" Copyright (c) 2014, 2015 Ted Unangst <tedu@openbsd.org>
 .\" Copyright (c) 2015 Doug Hogan <doug@openbsd.org>
@@ -18,7 +18,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: July 9 2019 $
+.Dd $Mdocdate: September 18 2023 $
 .Dt TLS_READ 3
 .Os
 .Sh NAME
@@ -26,8 +26,7 @@
 .Nm tls_write ,
 .Nm tls_handshake ,
 .Nm tls_error ,
-.Nm tls_close ,
-.Nm tls_reset
+.Nm tls_close
 .Nd use a TLS connection
 .Sh SYNOPSIS
 .In tls.h
@@ -49,8 +48,6 @@
 .Fn tls_error "struct tls *ctx"
 .Ft int
 .Fn tls_close "struct tls *ctx"
-.Ft void
-.Fn tls_reset "struct tls *ctx"
 .Sh DESCRIPTION
 .Fn tls_read
 reads
@@ -92,7 +89,6 @@ After closing the connection,
 .Fa ctx
 can be passed to
 .Xr tls_free 3 .
-.\" XXX Fn tls_reset does what?
 .Sh RETURN VALUES
 .Fn tls_read
 and
@@ -146,7 +142,7 @@ during or since the last call to
 .Fn tls_write ,
 .Fn tls_close ,
 or
-.Fn tls_reset
+.Xr tls_reset 3
 involving
 .Fa ctx ,
 or if memory allocation failed while trying to assemble the string
@@ -213,9 +209,8 @@ while (len > 0) {
 .Fn tls_read ,
 .Fn tls_write ,
 .Fn tls_error ,
-.Fn tls_close ,
 and
-.Fn tls_reset
+.Fn tls_close
 appeared in
 .Ox 5.6
 and got their final names in