summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2026-06-01 14:39:52 -0400
committerJune McEnroe <june@causal.agency>2026-06-01 14:39:52 -0400
commit8de0a43b1db624a766efd3d78a60403e77ce39e0 (patch)
tree630a8490c3773b78d50582691dff4d9c60a607d4
parentImport LibreSSL 3.8.4 (diff)
downloadlibretls-8de0a43b1db624a766efd3d78a60403e77ce39e0.tar.gz
libretls-8de0a43b1db624a766efd3d78a60403e77ce39e0.zip
Import LibreSSL 3.9.0
Diffstat (limited to '')
-rw-r--r--LIBTLS_VERSION2


-rw-r--r--VERSION2


-rw-r--r--include/compat/stdio.h2


-rw-r--r--include/compat/stdlib.h10


-rw-r--r--include/compat/string.h11


-rw-r--r--libtls.pc.in2


-rw-r--r--m4/check-hardening-options.m45


-rw-r--r--man/Makefile.am419


-rw-r--r--tls_conninfo.c6


-rw-r--r--tls_ocsp.c7


-rw-r--r--tls_verify.c4


11 files changed, 125 insertions, 345 deletions
diff --git a/LIBTLS_VERSION b/LIBTLS_VERSION
index fd02cce..3857442 100644
--- a/LIBTLS_VERSION
+++ b/LIBTLS_VERSION
@@ -1 +1 @@
-28:0:0
+29:0:0
diff --git a/VERSION b/VERSION
index 1c02ef6..ee9ddd3 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-3.8.4
+3.9.0
 
diff --git a/include/compat/stdio.h b/include/compat/stdio.h
index 1874aa5..2af8f3e 100644
--- a/include/compat/stdio.h
+++ b/include/compat/stdio.h
@@ -20,7 +20,9 @@
 
 #ifndef HAVE_ASPRINTF
 #include <stdarg.h>
+#define vasprintf libressl_vasprintf
 int vasprintf(char **str, const char *fmt, va_list ap);
+#define asprintf libressl_asprintf
 int asprintf(char **str, const char *fmt, ...);
 #endif
 
diff --git a/include/compat/stdlib.h b/include/compat/stdlib.h
index 2eaea24..76dc07c 100644
--- a/include/compat/stdlib.h
+++ b/include/compat/stdlib.h
@@ -20,26 +20,36 @@
 #include <stdint.h>
 
 #ifndef HAVE_ARC4RANDOM_BUF
+#define arc4random libressl_arc4random
 uint32_t arc4random(void);
+#define arc4random_buf libressl_arc4random_buf
 void arc4random_buf(void *_buf, size_t n);
+#define arc4random_uniform libressl_arc4random_uniform
 uint32_t arc4random_uniform(uint32_t upper_bound);
 #endif
 
 #ifndef HAVE_FREEZERO
+#define freezero libressl_freezero
 void freezero(void *ptr, size_t sz);
 #endif
 
 #ifndef HAVE_GETPROGNAME
+#define getprogname libressl_getprogname
 const char * getprogname(void);
 #endif
 
+#ifndef HAVE_REALLOCARRAY
+#define reallocarray libressl_reallocarray
 void *reallocarray(void *, size_t, size_t);
+#endif
 
 #ifndef HAVE_RECALLOCARRAY
+#define recallocarray libressl_recallocarray
 void *recallocarray(void *, size_t, size_t, size_t);
 #endif
 
 #ifndef HAVE_STRTONUM
+#define strtonum libressl_strtonum
 long long strtonum(const char *nptr, long long minval,
 		long long maxval, const char **errstr);
 #endif
diff --git a/include/compat/string.h b/include/compat/string.h
index 4bf7519..6a82793 100644
--- a/include/compat/string.h
+++ b/include/compat/string.h
@@ -27,43 +27,54 @@
 #endif
 
 #ifndef HAVE_STRCASECMP
+#define strcasecmp libressl_strcasecmp
 int strcasecmp(const char *s1, const char *s2);
+#define strncasecmp libressl_strncasecmp
 int strncasecmp(const char *s1, const char *s2, size_t len);
 #endif
 
 #ifndef HAVE_STRLCPY
+#define strlcpy libressl_strlcpy
 size_t strlcpy(char *dst, const char *src, size_t siz);
 #endif
 
 #ifndef HAVE_STRLCAT
+#define strlcat libressl_strlcat
 size_t strlcat(char *dst, const char *src, size_t siz);
 #endif
 
 #ifndef HAVE_STRNDUP
+#define strndup libressl_strndup
 char * strndup(const char *str, size_t maxlen);
 /* the only user of strnlen is strndup, so only build it if needed */
 #ifndef HAVE_STRNLEN
+#define strnlen libressl_strnlen
 size_t strnlen(const char *str, size_t maxlen);
 #endif
 #endif
 
 #ifndef HAVE_STRSEP
+#define strsep libressl_strsep
 char *strsep(char **stringp, const char *delim);
 #endif
 
 #ifndef HAVE_EXPLICIT_BZERO
+#define explicit_bzero libressl_explicit_bzero
 void explicit_bzero(void *, size_t);
 #endif
 
 #ifndef HAVE_TIMINGSAFE_BCMP
+#define timingsafe_bcmp libressl_timingsafe_bcmp
 int timingsafe_bcmp(const void *b1, const void *b2, size_t n);
 #endif
 
 #ifndef HAVE_TIMINGSAFE_MEMCMP
+#define timingsafe_memcmp libressl_timingsafe_memcmp
 int timingsafe_memcmp(const void *b1, const void *b2, size_t len);
 #endif
 
 #ifndef HAVE_MEMMEM
+#define memmem libressl_memmem
 void * memmem(const void *big, size_t big_len, const void *little,
 	size_t little_len);
 #endif
diff --git a/libtls.pc.in b/libtls.pc.in
index 3c49391..d176929 100644
--- a/libtls.pc.in
+++ b/libtls.pc.in
@@ -9,5 +9,5 @@ Name: LibreSSL-libtls
 Description: Secure communications using the TLS socket protocol.
 Version: @VERSION@
 Libs: -L${libdir} -ltls
-Libs.private: @LIBS@ @PLATFORM_LDADD@ -lssl -lcrypto
+Libs.private: @LIBS@ @PLATFORM_LDADD@
 Cflags: -I${includedir}
diff --git a/m4/check-hardening-options.m4 b/m4/check-hardening-options.m4
index 4b5784b..2cb3083 100644
--- a/m4/check-hardening-options.m4
+++ b/m4/check-hardening-options.m4
@@ -94,6 +94,11 @@ AC_DEFUN([CHECK_C_HARDENING_OPTIONS], [
 				AC_SEARCH_LIBS([__stack_chk_guard],[ssp])
 			])
 		])
+
+		# Check for control-flow integrity support
+		AS_IF([test "x$HOST_OS" != "xdarwin"], [
+			CHECK_CFLAG([[-fcf-protection=full]])
+		])
 	])
 
 	# Restore CC, LD
diff --git a/man/Makefile.am b/man/Makefile.am
index 7c7bb1a..2ae4f0a 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -135,7 +135,7 @@ dist_man3_MANS += ASN1_INTEGER_get.3
 dist_man3_MANS += ASN1_NULL_new.3
 dist_man3_MANS += ASN1_OBJECT_new.3
 dist_man3_MANS += ASN1_PRINTABLE_type.3
-dist_man3_MANS += ASN1_STRING_TABLE_add.3
+dist_man3_MANS += ASN1_STRING_TABLE_get.3
 dist_man3_MANS += ASN1_STRING_length.3
 dist_man3_MANS += ASN1_STRING_new.3
 dist_man3_MANS += ASN1_STRING_print_ex.3
@@ -153,7 +153,6 @@ dist_man3_MANS += ASN1_item_verify.3
 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
@@ -224,6 +223,7 @@ dist_man3_MANS += CMS_get0_type.3
 dist_man3_MANS += CMS_get1_ReceiptRequest.3
 dist_man3_MANS += CMS_sign.3
 dist_man3_MANS += CMS_sign_receipt.3
+dist_man3_MANS += CMS_signed_add1_attr.3
 dist_man3_MANS += CMS_uncompress.3
 dist_man3_MANS += CMS_verify.3
 dist_man3_MANS += CMS_verify_receipt.3
@@ -247,7 +247,7 @@ dist_man3_MANS += DSA_SIG_new.3
 dist_man3_MANS += DSA_do_sign.3
 dist_man3_MANS += DSA_dup_DH.3
 dist_man3_MANS += DSA_generate_key.3
-dist_man3_MANS += DSA_generate_parameters.3
+dist_man3_MANS += DSA_generate_parameters_ex.3
 dist_man3_MANS += DSA_get0_pqg.3
 dist_man3_MANS += DSA_get_ex_new_index.3
 dist_man3_MANS += DSA_meth_new.3
@@ -264,17 +264,7 @@ dist_man3_MANS += EC_KEY_METHOD_new.3
 dist_man3_MANS += EC_KEY_new.3
 dist_man3_MANS += EC_POINT_add.3
 dist_man3_MANS += EC_POINT_new.3
-dist_man3_MANS += ENGINE_add.3
-dist_man3_MANS += ENGINE_ctrl.3
-dist_man3_MANS += ENGINE_get_default_RSA.3
-dist_man3_MANS += ENGINE_init.3
 dist_man3_MANS += ENGINE_new.3
-dist_man3_MANS += ENGINE_register_RSA.3
-dist_man3_MANS += ENGINE_register_all_RSA.3
-dist_man3_MANS += ENGINE_set_RSA.3
-dist_man3_MANS += ENGINE_set_default.3
-dist_man3_MANS += ENGINE_set_flags.3
-dist_man3_MANS += ENGINE_unregister_RSA.3
 dist_man3_MANS += ERR.3
 dist_man3_MANS += ERR_GET_LIB.3
 dist_man3_MANS += ERR_asprintf_error_data.3
@@ -292,6 +282,7 @@ 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_init.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
@@ -302,7 +293,6 @@ 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
@@ -332,7 +322,6 @@ dist_man3_MANS += EVP_PKEY_verify_recover.3
 dist_man3_MANS += EVP_SealInit.3
 dist_man3_MANS += EVP_SignInit.3
 dist_man3_MANS += EVP_VerifyInit.3
-dist_man3_MANS += EVP_add_cipher.3
 dist_man3_MANS += EVP_aes_128_cbc.3
 dist_man3_MANS += EVP_camellia_128_cbc.3
 dist_man3_MANS += EVP_chacha20.3
@@ -447,7 +436,6 @@ dist_man3_MANS += X509_ATTRIBUTE_get0_object.3
 dist_man3_MANS += X509_ATTRIBUTE_new.3
 dist_man3_MANS += X509_ATTRIBUTE_set1_object.3
 dist_man3_MANS += X509_CINF_new.3
-dist_man3_MANS += X509_CRL_METHOD_new.3
 dist_man3_MANS += X509_CRL_get0_by_serial.3
 dist_man3_MANS += X509_CRL_new.3
 dist_man3_MANS += X509_CRL_print.3
@@ -564,7 +552,6 @@ dist_man3_MANS += i2a_ASN1_STRING.3
 dist_man3_MANS += i2d_CMS_bio_stream.3
 dist_man3_MANS += i2d_PKCS7_bio_stream.3
 dist_man3_MANS += lh_new.3
-dist_man3_MANS += lh_stats.3
 dist_man3_MANS += s2i_ASN1_INTEGER.3
 dist_man3_MANS += x509_verify.3
 dist_man3_MANS += tls_accept_socket.3
@@ -612,8 +599,6 @@ install-data-hook:
 	ln -sf "ASN1_NULL_new.3" "$(DESTDIR)$(mandir)/man3/ASN1_NULL_free.3"
 	ln -sf "ASN1_OBJECT_new.3" "$(DESTDIR)$(mandir)/man3/ASN1_OBJECT_create.3"
 	ln -sf "ASN1_OBJECT_new.3" "$(DESTDIR)$(mandir)/man3/ASN1_OBJECT_free.3"
-	ln -sf "ASN1_STRING_TABLE_add.3" "$(DESTDIR)$(mandir)/man3/ASN1_STRING_TABLE_cleanup.3"
-	ln -sf "ASN1_STRING_TABLE_add.3" "$(DESTDIR)$(mandir)/man3/ASN1_STRING_TABLE_get.3"
 	ln -sf "ASN1_STRING_length.3" "$(DESTDIR)$(mandir)/man3/ASN1_OCTET_STRING_cmp.3"
 	ln -sf "ASN1_STRING_length.3" "$(DESTDIR)$(mandir)/man3/ASN1_OCTET_STRING_dup.3"
 	ln -sf "ASN1_STRING_length.3" "$(DESTDIR)$(mandir)/man3/ASN1_OCTET_STRING_set.3"
@@ -690,6 +675,10 @@ install-data-hook:
 	ln -sf "ASN1_TIME_set.3" "$(DESTDIR)$(mandir)/man3/ASN1_UTCTIME_print.3"
 	ln -sf "ASN1_TIME_set.3" "$(DESTDIR)$(mandir)/man3/ASN1_UTCTIME_set.3"
 	ln -sf "ASN1_TIME_set.3" "$(DESTDIR)$(mandir)/man3/ASN1_UTCTIME_set_string.3"
+	ln -sf "ASN1_TIME_set.3" "$(DESTDIR)$(mandir)/man3/OPENSSL_gmtime.3"
+	ln -sf "ASN1_TIME_set.3" "$(DESTDIR)$(mandir)/man3/OPENSSL_posix_to_tm.3"
+	ln -sf "ASN1_TIME_set.3" "$(DESTDIR)$(mandir)/man3/OPENSSL_timegm.3"
+	ln -sf "ASN1_TIME_set.3" "$(DESTDIR)$(mandir)/man3/OPENSSL_tm_to_posix.3"
 	ln -sf "ASN1_TYPE_get.3" "$(DESTDIR)$(mandir)/man3/ASN1_TYPE_cmp.3"
 	ln -sf "ASN1_TYPE_get.3" "$(DESTDIR)$(mandir)/man3/ASN1_TYPE_free.3"
 	ln -sf "ASN1_TYPE_get.3" "$(DESTDIR)$(mandir)/man3/ASN1_TYPE_get_int_octetstring.3"
@@ -721,8 +710,6 @@ install-data-hook:
 	ln -sf "ASN1_parse_dump.3" "$(DESTDIR)$(mandir)/man3/ASN1_parse.3"
 	ln -sf "ASN1_put_object.3" "$(DESTDIR)$(mandir)/man3/ASN1_object_size.3"
 	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"
@@ -821,9 +808,6 @@ install-data-hook:
 	ln -sf "BIO_get_ex_new_index.3" "$(DESTDIR)$(mandir)/man3/EC_KEY_get_ex_data.3"
 	ln -sf "BIO_get_ex_new_index.3" "$(DESTDIR)$(mandir)/man3/EC_KEY_get_ex_new_index.3"
 	ln -sf "BIO_get_ex_new_index.3" "$(DESTDIR)$(mandir)/man3/EC_KEY_set_ex_data.3"
-	ln -sf "BIO_get_ex_new_index.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_ex_data.3"
-	ln -sf "BIO_get_ex_new_index.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_ex_new_index.3"
-	ln -sf "BIO_get_ex_new_index.3" "$(DESTDIR)$(mandir)/man3/ENGINE_set_ex_data.3"
 	ln -sf "BIO_get_ex_new_index.3" "$(DESTDIR)$(mandir)/man3/TYPE_get_app_data.3"
 	ln -sf "BIO_get_ex_new_index.3" "$(DESTDIR)$(mandir)/man3/TYPE_get_ex_data.3"
 	ln -sf "BIO_get_ex_new_index.3" "$(DESTDIR)$(mandir)/man3/TYPE_get_ex_new_index.3"
@@ -858,9 +842,6 @@ install-data-hook:
 	ln -sf "BIO_new.3" "$(DESTDIR)$(mandir)/man3/BIO_set.3"
 	ln -sf "BIO_new.3" "$(DESTDIR)$(mandir)/man3/BIO_up_ref.3"
 	ln -sf "BIO_new.3" "$(DESTDIR)$(mandir)/man3/BIO_vfree.3"
-	ln -sf "BIO_printf.3" "$(DESTDIR)$(mandir)/man3/BIO_snprintf.3"
-	ln -sf "BIO_printf.3" "$(DESTDIR)$(mandir)/man3/BIO_vprintf.3"
-	ln -sf "BIO_printf.3" "$(DESTDIR)$(mandir)/man3/BIO_vsnprintf.3"
 	ln -sf "BIO_push.3" "$(DESTDIR)$(mandir)/man3/BIO_pop.3"
 	ln -sf "BIO_push.3" "$(DESTDIR)$(mandir)/man3/BIO_set_next.3"
 	ln -sf "BIO_read.3" "$(DESTDIR)$(mandir)/man3/BIO_gets.3"
@@ -1045,7 +1026,6 @@ install-data-hook:
 	ln -sf "CMAC_Init.3" "$(DESTDIR)$(mandir)/man3/CMAC_CTX_new.3"
 	ln -sf "CMAC_Init.3" "$(DESTDIR)$(mandir)/man3/CMAC_Final.3"
 	ln -sf "CMAC_Init.3" "$(DESTDIR)$(mandir)/man3/CMAC_Update.3"
-	ln -sf "CMAC_Init.3" "$(DESTDIR)$(mandir)/man3/CMAC_resume.3"
 	ln -sf "CMS_ContentInfo_new.3" "$(DESTDIR)$(mandir)/man3/CMS_ContentInfo_free.3"
 	ln -sf "CMS_ContentInfo_new.3" "$(DESTDIR)$(mandir)/man3/CMS_ContentInfo_print_ctx.3"
 	ln -sf "CMS_ContentInfo_new.3" "$(DESTDIR)$(mandir)/man3/CMS_ReceiptRequest_free.3"
@@ -1080,6 +1060,25 @@ install-data-hook:
 	ln -sf "CMS_get1_ReceiptRequest.3" "$(DESTDIR)$(mandir)/man3/CMS_ReceiptRequest_create0.3"
 	ln -sf "CMS_get1_ReceiptRequest.3" "$(DESTDIR)$(mandir)/man3/CMS_ReceiptRequest_get0_values.3"
 	ln -sf "CMS_get1_ReceiptRequest.3" "$(DESTDIR)$(mandir)/man3/CMS_add1_ReceiptRequest.3"
+	ln -sf "CMS_signed_add1_attr.3" "$(DESTDIR)$(mandir)/man3/CMS_signed_add1_attr_by_NID.3"
+	ln -sf "CMS_signed_add1_attr.3" "$(DESTDIR)$(mandir)/man3/CMS_signed_add1_attr_by_OBJ.3"
+	ln -sf "CMS_signed_add1_attr.3" "$(DESTDIR)$(mandir)/man3/CMS_signed_add1_attr_by_txt.3"
+	ln -sf "CMS_signed_add1_attr.3" "$(DESTDIR)$(mandir)/man3/CMS_signed_delete_attr.3"
+	ln -sf "CMS_signed_add1_attr.3" "$(DESTDIR)$(mandir)/man3/CMS_signed_get0_data_by_OBJ.3"
+	ln -sf "CMS_signed_add1_attr.3" "$(DESTDIR)$(mandir)/man3/CMS_signed_get_attr.3"
+	ln -sf "CMS_signed_add1_attr.3" "$(DESTDIR)$(mandir)/man3/CMS_signed_get_attr_by_NID.3"
+	ln -sf "CMS_signed_add1_attr.3" "$(DESTDIR)$(mandir)/man3/CMS_signed_get_attr_by_OBJ.3"
+	ln -sf "CMS_signed_add1_attr.3" "$(DESTDIR)$(mandir)/man3/CMS_signed_get_attr_count.3"
+	ln -sf "CMS_signed_add1_attr.3" "$(DESTDIR)$(mandir)/man3/CMS_unsigned_add1_attr.3"
+	ln -sf "CMS_signed_add1_attr.3" "$(DESTDIR)$(mandir)/man3/CMS_unsigned_add1_attr_by_NID.3"
+	ln -sf "CMS_signed_add1_attr.3" "$(DESTDIR)$(mandir)/man3/CMS_unsigned_add1_attr_by_OBJ.3"
+	ln -sf "CMS_signed_add1_attr.3" "$(DESTDIR)$(mandir)/man3/CMS_unsigned_add1_attr_by_txt.3"
+	ln -sf "CMS_signed_add1_attr.3" "$(DESTDIR)$(mandir)/man3/CMS_unsigned_delete_attr.3"
+	ln -sf "CMS_signed_add1_attr.3" "$(DESTDIR)$(mandir)/man3/CMS_unsigned_get0_data_by_OBJ.3"
+	ln -sf "CMS_signed_add1_attr.3" "$(DESTDIR)$(mandir)/man3/CMS_unsigned_get_attr.3"
+	ln -sf "CMS_signed_add1_attr.3" "$(DESTDIR)$(mandir)/man3/CMS_unsigned_get_attr_by_NID.3"
+	ln -sf "CMS_signed_add1_attr.3" "$(DESTDIR)$(mandir)/man3/CMS_unsigned_get_attr_by_OBJ.3"
+	ln -sf "CMS_signed_add1_attr.3" "$(DESTDIR)$(mandir)/man3/CMS_unsigned_get_attr_count.3"
 	ln -sf "CMS_verify.3" "$(DESTDIR)$(mandir)/man3/CMS_get0_signers.3"
 	ln -sf "CONF_modules_free.3" "$(DESTDIR)$(mandir)/man3/CONF_modules_finish.3"
 	ln -sf "CONF_modules_free.3" "$(DESTDIR)$(mandir)/man3/CONF_modules_unload.3"
@@ -1091,10 +1090,6 @@ install-data-hook:
 	ln -sf "CRYPTO_get_mem_functions.3" "$(DESTDIR)$(mandir)/man3/CRYPTO_mem_leaks_cb.3"
 	ln -sf "CRYPTO_get_mem_functions.3" "$(DESTDIR)$(mandir)/man3/CRYPTO_mem_leaks_fp.3"
 	ln -sf "CRYPTO_get_mem_functions.3" "$(DESTDIR)$(mandir)/man3/CRYPTO_set_mem_functions.3"
-	ln -sf "CRYPTO_lock.3" "$(DESTDIR)$(mandir)/man3/CRYPTO_THREADID_cmp.3"
-	ln -sf "CRYPTO_lock.3" "$(DESTDIR)$(mandir)/man3/CRYPTO_THREADID_cpy.3"
-	ln -sf "CRYPTO_lock.3" "$(DESTDIR)$(mandir)/man3/CRYPTO_THREADID_current.3"
-	ln -sf "CRYPTO_lock.3" "$(DESTDIR)$(mandir)/man3/CRYPTO_THREADID_hash.3"
 	ln -sf "CRYPTO_lock.3" "$(DESTDIR)$(mandir)/man3/CRYPTO_add.3"
 	ln -sf "CRYPTO_lock.3" "$(DESTDIR)$(mandir)/man3/CRYPTO_r_lock.3"
 	ln -sf "CRYPTO_lock.3" "$(DESTDIR)$(mandir)/man3/CRYPTO_r_unlock.3"
@@ -1180,7 +1175,6 @@ install-data-hook:
 	ln -sf "DSA_SIG_new.3" "$(DESTDIR)$(mandir)/man3/DSA_SIG_get0.3"
 	ln -sf "DSA_SIG_new.3" "$(DESTDIR)$(mandir)/man3/DSA_SIG_set0.3"
 	ln -sf "DSA_do_sign.3" "$(DESTDIR)$(mandir)/man3/DSA_do_verify.3"
-	ln -sf "DSA_generate_parameters.3" "$(DESTDIR)$(mandir)/man3/DSA_generate_parameters_ex.3"
 	ln -sf "DSA_get0_pqg.3" "$(DESTDIR)$(mandir)/man3/DSA_clear_flags.3"
 	ln -sf "DSA_get0_pqg.3" "$(DESTDIR)$(mandir)/man3/DSA_get0_engine.3"
 	ln -sf "DSA_get0_pqg.3" "$(DESTDIR)$(mandir)/man3/DSA_get0_g.3"
@@ -1328,101 +1322,24 @@ install-data-hook:
 	ln -sf "EC_POINT_new.3" "$(DESTDIR)$(mandir)/man3/EC_POINT_set_compressed_coordinates.3"
 	ln -sf "EC_POINT_new.3" "$(DESTDIR)$(mandir)/man3/EC_POINT_set_compressed_coordinates_GFp.3"
 	ln -sf "EC_POINT_new.3" "$(DESTDIR)$(mandir)/man3/EC_POINT_set_to_infinity.3"
-	ln -sf "ENGINE_add.3" "$(DESTDIR)$(mandir)/man3/ENGINE_by_id.3"
-	ln -sf "ENGINE_add.3" "$(DESTDIR)$(mandir)/man3/ENGINE_cleanup.3"
-	ln -sf "ENGINE_add.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_first.3"
-	ln -sf "ENGINE_add.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_id.3"
-	ln -sf "ENGINE_add.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_last.3"
-	ln -sf "ENGINE_add.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_name.3"
-	ln -sf "ENGINE_add.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_next.3"
-	ln -sf "ENGINE_add.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_prev.3"
-	ln -sf "ENGINE_add.3" "$(DESTDIR)$(mandir)/man3/ENGINE_remove.3"
-	ln -sf "ENGINE_add.3" "$(DESTDIR)$(mandir)/man3/ENGINE_set_id.3"
-	ln -sf "ENGINE_add.3" "$(DESTDIR)$(mandir)/man3/ENGINE_set_name.3"
-	ln -sf "ENGINE_ctrl.3" "$(DESTDIR)$(mandir)/man3/ENGINE_CTRL_FUNC_PTR.3"
-	ln -sf "ENGINE_ctrl.3" "$(DESTDIR)$(mandir)/man3/ENGINE_cmd_is_executable.3"
-	ln -sf "ENGINE_ctrl.3" "$(DESTDIR)$(mandir)/man3/ENGINE_ctrl_cmd.3"
-	ln -sf "ENGINE_ctrl.3" "$(DESTDIR)$(mandir)/man3/ENGINE_ctrl_cmd_string.3"
-	ln -sf "ENGINE_ctrl.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_cmd_defns.3"
-	ln -sf "ENGINE_ctrl.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_ctrl_function.3"
-	ln -sf "ENGINE_ctrl.3" "$(DESTDIR)$(mandir)/man3/ENGINE_set_cmd_defns.3"
-	ln -sf "ENGINE_ctrl.3" "$(DESTDIR)$(mandir)/man3/ENGINE_set_ctrl_function.3"
-	ln -sf "ENGINE_get_default_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_cipher_engine.3"
-	ln -sf "ENGINE_get_default_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_default_DH.3"
-	ln -sf "ENGINE_get_default_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_default_DSA.3"
-	ln -sf "ENGINE_get_default_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_default_EC.3"
-	ln -sf "ENGINE_get_default_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_default_RAND.3"
-	ln -sf "ENGINE_get_default_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_digest_engine.3"
-	ln -sf "ENGINE_get_default_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_table_flags.3"
-	ln -sf "ENGINE_get_default_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_set_table_flags.3"
-	ln -sf "ENGINE_init.3" "$(DESTDIR)$(mandir)/man3/ENGINE_GEN_INT_FUNC_PTR.3"
-	ln -sf "ENGINE_init.3" "$(DESTDIR)$(mandir)/man3/ENGINE_finish.3"
-	ln -sf "ENGINE_init.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_finish_function.3"
-	ln -sf "ENGINE_init.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_init_function.3"
-	ln -sf "ENGINE_init.3" "$(DESTDIR)$(mandir)/man3/ENGINE_set_finish_function.3"
-	ln -sf "ENGINE_init.3" "$(DESTDIR)$(mandir)/man3/ENGINE_set_init_function.3"
-	ln -sf "ENGINE_new.3" "$(DESTDIR)$(mandir)/man3/ENGINE_GEN_INT_FUNC_PTR.3"
+	ln -sf "ENGINE_new.3" "$(DESTDIR)$(mandir)/man3/ENGINE_by_id.3"
+	ln -sf "ENGINE_new.3" "$(DESTDIR)$(mandir)/man3/ENGINE_cleanup.3"
+	ln -sf "ENGINE_new.3" "$(DESTDIR)$(mandir)/man3/ENGINE_ctrl_cmd.3"
+	ln -sf "ENGINE_new.3" "$(DESTDIR)$(mandir)/man3/ENGINE_ctrl_cmd_string.3"
+	ln -sf "ENGINE_new.3" "$(DESTDIR)$(mandir)/man3/ENGINE_finish.3"
 	ln -sf "ENGINE_new.3" "$(DESTDIR)$(mandir)/man3/ENGINE_free.3"
-	ln -sf "ENGINE_new.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_destroy_function.3"
-	ln -sf "ENGINE_new.3" "$(DESTDIR)$(mandir)/man3/ENGINE_set_destroy_function.3"
-	ln -sf "ENGINE_new.3" "$(DESTDIR)$(mandir)/man3/ENGINE_up_ref.3"
-	ln -sf "ENGINE_register_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_register_DH.3"
-	ln -sf "ENGINE_register_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_register_DSA.3"
-	ln -sf "ENGINE_register_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_register_ECDH.3"
-	ln -sf "ENGINE_register_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_register_ECDSA.3"
-	ln -sf "ENGINE_register_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_register_RAND.3"
-	ln -sf "ENGINE_register_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_register_STORE.3"
-	ln -sf "ENGINE_register_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_register_ciphers.3"
-	ln -sf "ENGINE_register_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_register_complete.3"
-	ln -sf "ENGINE_register_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_register_digests.3"
-	ln -sf "ENGINE_register_all_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_load_builtin_engines.3"
-	ln -sf "ENGINE_register_all_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_load_dynamic.3"
-	ln -sf "ENGINE_register_all_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_register_all_DH.3"
-	ln -sf "ENGINE_register_all_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_register_all_DSA.3"
-	ln -sf "ENGINE_register_all_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_register_all_ECDH.3"
-	ln -sf "ENGINE_register_all_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_register_all_ECDSA.3"
-	ln -sf "ENGINE_register_all_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_register_all_RAND.3"
-	ln -sf "ENGINE_register_all_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_register_all_STORE.3"
-	ln -sf "ENGINE_register_all_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_register_all_ciphers.3"
-	ln -sf "ENGINE_register_all_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_register_all_complete.3"
-	ln -sf "ENGINE_register_all_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_register_all_digests.3"
-	ln -sf "ENGINE_set_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_CIPHERS_PTR.3"
-	ln -sf "ENGINE_set_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_DIGESTS_PTR.3"
-	ln -sf "ENGINE_set_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_DH.3"
-	ln -sf "ENGINE_set_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_DSA.3"
-	ln -sf "ENGINE_set_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_EC.3"
-	ln -sf "ENGINE_set_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_RAND.3"
-	ln -sf "ENGINE_set_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_RSA.3"
-	ln -sf "ENGINE_set_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_STORE.3"
-	ln -sf "ENGINE_set_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_cipher.3"
-	ln -sf "ENGINE_set_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_ciphers.3"
-	ln -sf "ENGINE_set_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_digest.3"
-	ln -sf "ENGINE_set_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_digests.3"
-	ln -sf "ENGINE_set_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_set_DH.3"
-	ln -sf "ENGINE_set_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_set_DSA.3"
-	ln -sf "ENGINE_set_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_set_EC.3"
-	ln -sf "ENGINE_set_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_set_RAND.3"
-	ln -sf "ENGINE_set_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_set_STORE.3"
-	ln -sf "ENGINE_set_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_set_ciphers.3"
-	ln -sf "ENGINE_set_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_set_digests.3"
-	ln -sf "ENGINE_set_default.3" "$(DESTDIR)$(mandir)/man3/ENGINE_set_default_DH.3"
-	ln -sf "ENGINE_set_default.3" "$(DESTDIR)$(mandir)/man3/ENGINE_set_default_DSA.3"
-	ln -sf "ENGINE_set_default.3" "$(DESTDIR)$(mandir)/man3/ENGINE_set_default_ECDH.3"
-	ln -sf "ENGINE_set_default.3" "$(DESTDIR)$(mandir)/man3/ENGINE_set_default_ECDSA.3"
-	ln -sf "ENGINE_set_default.3" "$(DESTDIR)$(mandir)/man3/ENGINE_set_default_RAND.3"
-	ln -sf "ENGINE_set_default.3" "$(DESTDIR)$(mandir)/man3/ENGINE_set_default_RSA.3"
-	ln -sf "ENGINE_set_default.3" "$(DESTDIR)$(mandir)/man3/ENGINE_set_default_ciphers.3"
-	ln -sf "ENGINE_set_default.3" "$(DESTDIR)$(mandir)/man3/ENGINE_set_default_digests.3"
-	ln -sf "ENGINE_set_default.3" "$(DESTDIR)$(mandir)/man3/ENGINE_set_default_string.3"
-	ln -sf "ENGINE_set_flags.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_flags.3"
-	ln -sf "ENGINE_unregister_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_unregister_DH.3"
-	ln -sf "ENGINE_unregister_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_unregister_DSA.3"
-	ln -sf "ENGINE_unregister_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_unregister_ECDH.3"
-	ln -sf "ENGINE_unregister_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_unregister_ECDSA.3"
-	ln -sf "ENGINE_unregister_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_unregister_RAND.3"
-	ln -sf "ENGINE_unregister_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_unregister_STORE.3"
-	ln -sf "ENGINE_unregister_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_unregister_ciphers.3"
-	ln -sf "ENGINE_unregister_RSA.3" "$(DESTDIR)$(mandir)/man3/ENGINE_unregister_digests.3"
+	ln -sf "ENGINE_new.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_default_RSA.3"
+	ln -sf "ENGINE_new.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_id.3"
+	ln -sf "ENGINE_new.3" "$(DESTDIR)$(mandir)/man3/ENGINE_get_name.3"
+	ln -sf "ENGINE_new.3" "$(DESTDIR)$(mandir)/man3/ENGINE_init.3"
+	ln -sf "ENGINE_new.3" "$(DESTDIR)$(mandir)/man3/ENGINE_load_builtin_engines.3"
+	ln -sf "ENGINE_new.3" "$(DESTDIR)$(mandir)/man3/ENGINE_load_dynamic.3"
+	ln -sf "ENGINE_new.3" "$(DESTDIR)$(mandir)/man3/ENGINE_load_openssl.3"
+	ln -sf "ENGINE_new.3" "$(DESTDIR)$(mandir)/man3/ENGINE_load_private_key.3"
+	ln -sf "ENGINE_new.3" "$(DESTDIR)$(mandir)/man3/ENGINE_load_public_key.3"
+	ln -sf "ENGINE_new.3" "$(DESTDIR)$(mandir)/man3/ENGINE_register_all_complete.3"
+	ln -sf "ENGINE_new.3" "$(DESTDIR)$(mandir)/man3/ENGINE_set_default.3"
+	ln -sf "ENGINE_new.3" "$(DESTDIR)$(mandir)/man3/ENGINE_set_default_RSA.3"
 	ln -sf "ERR_GET_LIB.3" "$(DESTDIR)$(mandir)/man3/ERR_FATAL_ERROR.3"
 	ln -sf "ERR_GET_LIB.3" "$(DESTDIR)$(mandir)/man3/ERR_GET_FUNC.3"
 	ln -sf "ERR_GET_LIB.3" "$(DESTDIR)$(mandir)/man3/ERR_GET_REASON.3"
@@ -1476,6 +1393,8 @@ install-data-hook:
 	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_init.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_cleanup.3"
+	ln -sf "EVP_CIPHER_CTX_init.3" "$(DESTDIR)$(mandir)/man3/EVP_Cipher.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"
@@ -1486,6 +1405,8 @@ install-data-hook:
 	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"
+	ln -sf "EVP_CIPHER_do_all.3" "$(DESTDIR)$(mandir)/man3/OBJ_NAME_do_all.3"
+	ln -sf "EVP_CIPHER_do_all.3" "$(DESTDIR)$(mandir)/man3/OBJ_NAME_do_all_sorted.3"
 	ln -sf "EVP_CIPHER_meth_new.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_meth_dup.3"
 	ln -sf "EVP_CIPHER_meth_new.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_meth_free.3"
 	ln -sf "EVP_CIPHER_meth_new.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_meth_set_cleanup.3"
@@ -1549,14 +1470,11 @@ install-data-hook:
 	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_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_copy.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_free.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_new.3"
 	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_reset.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"
 	ln -sf "EVP_EncryptInit.3" "$(DESTDIR)$(mandir)/man3/EVP_CipherInit.3"
@@ -1603,18 +1521,6 @@ install-data-hook:
 	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"
-	ln -sf "EVP_MD_meth_new.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_meth_set_cleanup.3"
-	ln -sf "EVP_MD_meth_new.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_meth_set_copy.3"
-	ln -sf "EVP_MD_meth_new.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_meth_set_ctrl.3"
-	ln -sf "EVP_MD_meth_new.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_meth_set_final.3"
-	ln -sf "EVP_MD_meth_new.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_meth_set_flags.3"
-	ln -sf "EVP_MD_meth_new.3" "$(DESTDIR)$(mandir)/man3/EVP_MD_meth_set_init.3"
-	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"
@@ -1669,8 +1575,6 @@ install-data-hook:
 	ln -sf "EVP_PKEY_asn1_get_count.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_asn1_get0.3"
 	ln -sf "EVP_PKEY_asn1_get_count.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_asn1_get0_info.3"
 	ln -sf "EVP_PKEY_asn1_get_count.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_get0_asn1.3"
-	ln -sf "EVP_PKEY_asn1_new.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_asn1_add0.3"
-	ln -sf "EVP_PKEY_asn1_new.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_asn1_add_alias.3"
 	ln -sf "EVP_PKEY_asn1_new.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_asn1_copy.3"
 	ln -sf "EVP_PKEY_asn1_new.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_asn1_free.3"
 	ln -sf "EVP_PKEY_asn1_new.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_asn1_set_check.3"
@@ -1739,7 +1643,6 @@ install-data-hook:
 	ln -sf "EVP_PKEY_set1_RSA.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_assign_DH.3"
 	ln -sf "EVP_PKEY_set1_RSA.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_assign_DSA.3"
 	ln -sf "EVP_PKEY_set1_RSA.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_assign_EC_KEY.3"
-	ln -sf "EVP_PKEY_set1_RSA.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_assign_GOST.3"
 	ln -sf "EVP_PKEY_set1_RSA.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_assign_RSA.3"
 	ln -sf "EVP_PKEY_set1_RSA.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_base_id.3"
 	ln -sf "EVP_PKEY_set1_RSA.3" "$(DESTDIR)$(mandir)/man3/EVP_PKEY_get0.3"
@@ -1772,11 +1675,6 @@ install-data-hook:
 	ln -sf "EVP_VerifyInit.3" "$(DESTDIR)$(mandir)/man3/EVP_VerifyFinal.3"
 	ln -sf "EVP_VerifyInit.3" "$(DESTDIR)$(mandir)/man3/EVP_VerifyInit_ex.3"
 	ln -sf "EVP_VerifyInit.3" "$(DESTDIR)$(mandir)/man3/EVP_VerifyUpdate.3"
-	ln -sf "EVP_add_cipher.3" "$(DESTDIR)$(mandir)/man3/EVP_add_cipher_alias.3"
-	ln -sf "EVP_add_cipher.3" "$(DESTDIR)$(mandir)/man3/EVP_add_digest.3"
-	ln -sf "EVP_add_cipher.3" "$(DESTDIR)$(mandir)/man3/EVP_add_digest_alias.3"
-	ln -sf "EVP_add_cipher.3" "$(DESTDIR)$(mandir)/man3/EVP_delete_cipher_alias.3"
-	ln -sf "EVP_add_cipher.3" "$(DESTDIR)$(mandir)/man3/EVP_delete_digest_alias.3"
 	ln -sf "EVP_aes_128_cbc.3" "$(DESTDIR)$(mandir)/man3/EVP_aes_128_cbc_hmac_sha1.3"
 	ln -sf "EVP_aes_128_cbc.3" "$(DESTDIR)$(mandir)/man3/EVP_aes_128_ccm.3"
 	ln -sf "EVP_aes_128_cbc.3" "$(DESTDIR)$(mandir)/man3/EVP_aes_128_cfb.3"
@@ -1913,8 +1811,6 @@ install-data-hook:
 	ln -sf "NAME_CONSTRAINTS_new.3" "$(DESTDIR)$(mandir)/man3/GENERAL_SUBTREE_new.3"
 	ln -sf "NAME_CONSTRAINTS_new.3" "$(DESTDIR)$(mandir)/man3/NAME_CONSTRAINTS_free.3"
 	ln -sf "OBJ_NAME_add.3" "$(DESTDIR)$(mandir)/man3/OBJ_NAME_cleanup.3"
-	ln -sf "OBJ_NAME_add.3" "$(DESTDIR)$(mandir)/man3/OBJ_NAME_do_all.3"
-	ln -sf "OBJ_NAME_add.3" "$(DESTDIR)$(mandir)/man3/OBJ_NAME_do_all_sorted.3"
 	ln -sf "OBJ_NAME_add.3" "$(DESTDIR)$(mandir)/man3/OBJ_NAME_get.3"
 	ln -sf "OBJ_NAME_add.3" "$(DESTDIR)$(mandir)/man3/OBJ_NAME_init.3"
 	ln -sf "OBJ_NAME_add.3" "$(DESTDIR)$(mandir)/man3/OBJ_NAME_new_index.3"
@@ -1923,8 +1819,6 @@ install-data-hook:
 	ln -sf "OBJ_create.3" "$(DESTDIR)$(mandir)/man3/OBJ_cleanup.3"
 	ln -sf "OBJ_create.3" "$(DESTDIR)$(mandir)/man3/OBJ_create_objects.3"
 	ln -sf "OBJ_create.3" "$(DESTDIR)$(mandir)/man3/OBJ_new_nid.3"
-	ln -sf "OBJ_create.3" "$(DESTDIR)$(mandir)/man3/check_defer.3"
-	ln -sf "OBJ_create.3" "$(DESTDIR)$(mandir)/man3/obj_cleanup_defer.3"
 	ln -sf "OBJ_find_sigid_algs.3" "$(DESTDIR)$(mandir)/man3/OBJ_find_sigid_by_algs.3"
 	ln -sf "OBJ_nid2obj.3" "$(DESTDIR)$(mandir)/man3/OBJ_cmp.3"
 	ln -sf "OBJ_nid2obj.3" "$(DESTDIR)$(mandir)/man3/OBJ_dup.3"
@@ -2006,7 +1900,6 @@ install-data-hook:
 	ln -sf "OPENSSL_config.3" "$(DESTDIR)$(mandir)/man3/OPENSSL_no_config.3"
 	ln -sf "OPENSSL_init_crypto.3" "$(DESTDIR)$(mandir)/man3/OPENSSL_init.3"
 	ln -sf "OPENSSL_load_builtin_modules.3" "$(DESTDIR)$(mandir)/man3/ASN1_add_oid_module.3"
-	ln -sf "OPENSSL_load_builtin_modules.3" "$(DESTDIR)$(mandir)/man3/ENGINE_add_conf_module.3"
 	ln -sf "OPENSSL_malloc.3" "$(DESTDIR)$(mandir)/man3/CRYPTO_free.3"
 	ln -sf "OPENSSL_malloc.3" "$(DESTDIR)$(mandir)/man3/CRYPTO_malloc.3"
 	ln -sf "OPENSSL_malloc.3" "$(DESTDIR)$(mandir)/man3/CRYPTO_realloc.3"
@@ -2018,7 +1911,6 @@ install-data-hook:
 	ln -sf "OPENSSL_sk_new.3" "$(DESTDIR)$(mandir)/man3/sk_delete_ptr.3"
 	ln -sf "OPENSSL_sk_new.3" "$(DESTDIR)$(mandir)/man3/sk_dup.3"
 	ln -sf "OPENSSL_sk_new.3" "$(DESTDIR)$(mandir)/man3/sk_find.3"
-	ln -sf "OPENSSL_sk_new.3" "$(DESTDIR)$(mandir)/man3/sk_find_ex.3"
 	ln -sf "OPENSSL_sk_new.3" "$(DESTDIR)$(mandir)/man3/sk_free.3"
 	ln -sf "OPENSSL_sk_new.3" "$(DESTDIR)$(mandir)/man3/sk_insert.3"
 	ln -sf "OPENSSL_sk_new.3" "$(DESTDIR)$(mandir)/man3/sk_is_sorted.3"
@@ -2711,10 +2603,6 @@ install-data-hook:
 	ln -sf "X509_CINF_new.3" "$(DESTDIR)$(mandir)/man3/X509_CINF_free.3"
 	ln -sf "X509_CINF_new.3" "$(DESTDIR)$(mandir)/man3/X509_VAL_free.3"
 	ln -sf "X509_CINF_new.3" "$(DESTDIR)$(mandir)/man3/X509_VAL_new.3"
-	ln -sf "X509_CRL_METHOD_new.3" "$(DESTDIR)$(mandir)/man3/X509_CRL_METHOD_free.3"
-	ln -sf "X509_CRL_METHOD_new.3" "$(DESTDIR)$(mandir)/man3/X509_CRL_get_meth_data.3"
-	ln -sf "X509_CRL_METHOD_new.3" "$(DESTDIR)$(mandir)/man3/X509_CRL_set_default_method.3"
-	ln -sf "X509_CRL_METHOD_new.3" "$(DESTDIR)$(mandir)/man3/X509_CRL_set_meth_data.3"
 	ln -sf "X509_CRL_get0_by_serial.3" "$(DESTDIR)$(mandir)/man3/X509_CRL_add0_revoked.3"
 	ln -sf "X509_CRL_get0_by_serial.3" "$(DESTDIR)$(mandir)/man3/X509_CRL_get0_by_cert.3"
 	ln -sf "X509_CRL_get0_by_serial.3" "$(DESTDIR)$(mandir)/man3/X509_CRL_get_REVOKED.3"
@@ -2873,7 +2761,6 @@ install-data-hook:
 	ln -sf "X509_STORE_CTX_new.3" "$(DESTDIR)$(mandir)/man3/X509_STORE_CTX_set_chain.3"
 	ln -sf "X509_STORE_CTX_new.3" "$(DESTDIR)$(mandir)/man3/X509_STORE_CTX_trusted_stack.3"
 	ln -sf "X509_STORE_CTX_set_flags.3" "$(DESTDIR)$(mandir)/man3/X509_STORE_CTX_get0_param.3"
-	ln -sf "X509_STORE_CTX_set_flags.3" "$(DESTDIR)$(mandir)/man3/X509_STORE_CTX_purpose_inherit.3"
 	ln -sf "X509_STORE_CTX_set_flags.3" "$(DESTDIR)$(mandir)/man3/X509_STORE_CTX_set0_param.3"
 	ln -sf "X509_STORE_CTX_set_flags.3" "$(DESTDIR)$(mandir)/man3/X509_STORE_CTX_set_default.3"
 	ln -sf "X509_STORE_CTX_set_flags.3" "$(DESTDIR)$(mandir)/man3/X509_STORE_CTX_set_depth.3"
@@ -2907,6 +2794,7 @@ install-data-hook:
 	ln -sf "X509_STORE_set1_param.3" "$(DESTDIR)$(mandir)/man3/X509_STORE_add_crl.3"
 	ln -sf "X509_STORE_set1_param.3" "$(DESTDIR)$(mandir)/man3/X509_STORE_get0_objects.3"
 	ln -sf "X509_STORE_set1_param.3" "$(DESTDIR)$(mandir)/man3/X509_STORE_get0_param.3"
+	ln -sf "X509_STORE_set1_param.3" "$(DESTDIR)$(mandir)/man3/X509_STORE_get1_objects.3"
 	ln -sf "X509_STORE_set1_param.3" "$(DESTDIR)$(mandir)/man3/X509_STORE_get_ex_data.3"
 	ln -sf "X509_STORE_set1_param.3" "$(DESTDIR)$(mandir)/man3/X509_STORE_get_ex_new_index.3"
 	ln -sf "X509_STORE_set1_param.3" "$(DESTDIR)$(mandir)/man3/X509_STORE_set_depth.3"
@@ -3100,32 +2988,18 @@ install-data-hook:
 	ln -sf "X509v3_get_ext_by_NID.3" "$(DESTDIR)$(mandir)/man3/X509v3_get_ext_by_critical.3"
 	ln -sf "X509v3_get_ext_by_NID.3" "$(DESTDIR)$(mandir)/man3/X509v3_get_ext_count.3"
 	ln -sf "bn_dump.3" "$(DESTDIR)$(mandir)/man3/bn_add_words.3"
-	ln -sf "bn_dump.3" "$(DESTDIR)$(mandir)/man3/bn_check_top.3"
-	ln -sf "bn_dump.3" "$(DESTDIR)$(mandir)/man3/bn_cmp_words.3"
 	ln -sf "bn_dump.3" "$(DESTDIR)$(mandir)/man3/bn_div_words.3"
 	ln -sf "bn_dump.3" "$(DESTDIR)$(mandir)/man3/bn_expand.3"
-	ln -sf "bn_dump.3" "$(DESTDIR)$(mandir)/man3/bn_expand2.3"
-	ln -sf "bn_dump.3" "$(DESTDIR)$(mandir)/man3/bn_fix_top.3"
 	ln -sf "bn_dump.3" "$(DESTDIR)$(mandir)/man3/bn_mul_add_words.3"
 	ln -sf "bn_dump.3" "$(DESTDIR)$(mandir)/man3/bn_mul_comba4.3"
 	ln -sf "bn_dump.3" "$(DESTDIR)$(mandir)/man3/bn_mul_comba8.3"
 	ln -sf "bn_dump.3" "$(DESTDIR)$(mandir)/man3/bn_mul_normal.3"
-	ln -sf "bn_dump.3" "$(DESTDIR)$(mandir)/man3/bn_mul_part_recursive.3"
-	ln -sf "bn_dump.3" "$(DESTDIR)$(mandir)/man3/bn_mul_recursive.3"
 	ln -sf "bn_dump.3" "$(DESTDIR)$(mandir)/man3/bn_mul_words.3"
-	ln -sf "bn_dump.3" "$(DESTDIR)$(mandir)/man3/bn_set_high.3"
-	ln -sf "bn_dump.3" "$(DESTDIR)$(mandir)/man3/bn_set_low.3"
-	ln -sf "bn_dump.3" "$(DESTDIR)$(mandir)/man3/bn_set_max.3"
 	ln -sf "bn_dump.3" "$(DESTDIR)$(mandir)/man3/bn_sqr_comba4.3"
 	ln -sf "bn_dump.3" "$(DESTDIR)$(mandir)/man3/bn_sqr_comba8.3"
-	ln -sf "bn_dump.3" "$(DESTDIR)$(mandir)/man3/bn_sqr_normal.3"
-	ln -sf "bn_dump.3" "$(DESTDIR)$(mandir)/man3/bn_sqr_recursive.3"
 	ln -sf "bn_dump.3" "$(DESTDIR)$(mandir)/man3/bn_sqr_words.3"
 	ln -sf "bn_dump.3" "$(DESTDIR)$(mandir)/man3/bn_sub_words.3"
 	ln -sf "bn_dump.3" "$(DESTDIR)$(mandir)/man3/bn_wexpand.3"
-	ln -sf "bn_dump.3" "$(DESTDIR)$(mandir)/man3/mul.3"
-	ln -sf "bn_dump.3" "$(DESTDIR)$(mandir)/man3/mul_add.3"
-	ln -sf "bn_dump.3" "$(DESTDIR)$(mandir)/man3/sqr.3"
 	ln -sf "d2i_ASN1_NULL.3" "$(DESTDIR)$(mandir)/man3/i2d_ASN1_NULL.3"
 	ln -sf "d2i_ASN1_OBJECT.3" "$(DESTDIR)$(mandir)/man3/OBJ_get0_data.3"
 	ln -sf "d2i_ASN1_OBJECT.3" "$(DESTDIR)$(mandir)/man3/OBJ_length.3"
@@ -3464,11 +3338,6 @@ install-data-hook:
 	ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/lh_insert.3"
 	ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/lh_retrieve.3"
 	ln -sf "lh_new.3" "$(DESTDIR)$(mandir)/man3/lh_strhash.3"
-	ln -sf "lh_stats.3" "$(DESTDIR)$(mandir)/man3/lh_node_stats.3"
-	ln -sf "lh_stats.3" "$(DESTDIR)$(mandir)/man3/lh_node_stats_bio.3"
-	ln -sf "lh_stats.3" "$(DESTDIR)$(mandir)/man3/lh_node_usage_stats.3"
-	ln -sf "lh_stats.3" "$(DESTDIR)$(mandir)/man3/lh_node_usage_stats_bio.3"
-	ln -sf "lh_stats.3" "$(DESTDIR)$(mandir)/man3/lh_stats_bio.3"
 	ln -sf "s2i_ASN1_INTEGER.3" "$(DESTDIR)$(mandir)/man3/i2s_ASN1_ENUMERATED.3"
 	ln -sf "s2i_ASN1_INTEGER.3" "$(DESTDIR)$(mandir)/man3/i2s_ASN1_ENUMERATED_TABLE.3"
 	ln -sf "s2i_ASN1_INTEGER.3" "$(DESTDIR)$(mandir)/man3/i2s_ASN1_INTEGER.3"
@@ -3592,8 +3461,6 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/ASN1_NULL_free.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ASN1_OBJECT_create.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ASN1_OBJECT_free.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ASN1_STRING_TABLE_cleanup.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ASN1_STRING_TABLE_get.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ASN1_OCTET_STRING_cmp.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ASN1_OCTET_STRING_dup.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ASN1_OCTET_STRING_set.3"
@@ -3670,6 +3537,10 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/ASN1_UTCTIME_print.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ASN1_UTCTIME_set.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ASN1_UTCTIME_set_string.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/OPENSSL_gmtime.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/OPENSSL_posix_to_tm.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/OPENSSL_timegm.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/OPENSSL_tm_to_posix.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ASN1_TYPE_cmp.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ASN1_TYPE_free.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ASN1_TYPE_get_int_octetstring.3"
@@ -3701,8 +3572,6 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/ASN1_parse.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ASN1_object_size.3"
 	-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"
@@ -3801,9 +3670,6 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/EC_KEY_get_ex_data.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EC_KEY_get_ex_new_index.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EC_KEY_set_ex_data.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_ex_data.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_ex_new_index.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_set_ex_data.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/TYPE_get_app_data.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/TYPE_get_ex_data.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/TYPE_get_ex_new_index.3"
@@ -3838,9 +3704,6 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/BIO_set.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/BIO_up_ref.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/BIO_vfree.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/BIO_snprintf.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/BIO_vprintf.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/BIO_vsnprintf.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/BIO_pop.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/BIO_set_next.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/BIO_gets.3"
@@ -4025,7 +3888,6 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/CMAC_CTX_new.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/CMAC_Final.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/CMAC_Update.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/CMAC_resume.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/CMS_ContentInfo_free.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/CMS_ContentInfo_print_ctx.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/CMS_ReceiptRequest_free.3"
@@ -4060,6 +3922,25 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/CMS_ReceiptRequest_create0.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/CMS_ReceiptRequest_get0_values.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/CMS_add1_ReceiptRequest.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/CMS_signed_add1_attr_by_NID.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/CMS_signed_add1_attr_by_OBJ.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/CMS_signed_add1_attr_by_txt.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/CMS_signed_delete_attr.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/CMS_signed_get0_data_by_OBJ.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/CMS_signed_get_attr.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/CMS_signed_get_attr_by_NID.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/CMS_signed_get_attr_by_OBJ.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/CMS_signed_get_attr_count.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/CMS_unsigned_add1_attr.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/CMS_unsigned_add1_attr_by_NID.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/CMS_unsigned_add1_attr_by_OBJ.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/CMS_unsigned_add1_attr_by_txt.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/CMS_unsigned_delete_attr.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/CMS_unsigned_get0_data_by_OBJ.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/CMS_unsigned_get_attr.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/CMS_unsigned_get_attr_by_NID.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/CMS_unsigned_get_attr_by_OBJ.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/CMS_unsigned_get_attr_count.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/CMS_get0_signers.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/CONF_modules_finish.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/CONF_modules_unload.3"
@@ -4071,10 +3952,6 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/CRYPTO_mem_leaks_cb.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/CRYPTO_mem_leaks_fp.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/CRYPTO_set_mem_functions.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/CRYPTO_THREADID_cmp.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/CRYPTO_THREADID_cpy.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/CRYPTO_THREADID_current.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/CRYPTO_THREADID_hash.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/CRYPTO_add.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/CRYPTO_r_lock.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/CRYPTO_r_unlock.3"
@@ -4160,7 +4037,6 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/DSA_SIG_get0.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/DSA_SIG_set0.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/DSA_do_verify.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/DSA_generate_parameters_ex.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/DSA_clear_flags.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/DSA_get0_engine.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/DSA_get0_g.3"
@@ -4310,99 +4186,22 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/EC_POINT_set_to_infinity.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_by_id.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_cleanup.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_first.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_id.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_last.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_name.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_next.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_prev.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_remove.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_set_id.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_set_name.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_CTRL_FUNC_PTR.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_cmd_is_executable.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_ctrl_cmd.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_ctrl_cmd_string.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_cmd_defns.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_ctrl_function.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_set_cmd_defns.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_set_ctrl_function.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_cipher_engine.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_default_DH.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_default_DSA.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_default_EC.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_default_RAND.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_digest_engine.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_table_flags.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_set_table_flags.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_GEN_INT_FUNC_PTR.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_finish.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_finish_function.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_init_function.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_set_finish_function.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_set_init_function.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_GEN_INT_FUNC_PTR.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_free.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_destroy_function.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_set_destroy_function.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_up_ref.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_register_DH.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_register_DSA.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_register_ECDH.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_register_ECDSA.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_register_RAND.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_register_STORE.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_register_ciphers.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_register_complete.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_register_digests.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_default_RSA.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_id.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_name.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_init.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_load_builtin_engines.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_load_dynamic.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_register_all_DH.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_register_all_DSA.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_register_all_ECDH.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_register_all_ECDSA.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_register_all_RAND.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_register_all_STORE.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_register_all_ciphers.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_load_openssl.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_load_private_key.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_load_public_key.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_register_all_complete.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_register_all_digests.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_CIPHERS_PTR.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_DIGESTS_PTR.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_DH.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_DSA.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_EC.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_RAND.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_RSA.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_STORE.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_cipher.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_ciphers.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_digest.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_digests.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_set_DH.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_set_DSA.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_set_EC.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_set_RAND.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_set_STORE.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_set_ciphers.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_set_digests.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_set_default_DH.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_set_default_DSA.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_set_default_ECDH.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_set_default_ECDSA.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_set_default_RAND.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_set_default.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_set_default_RSA.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_set_default_ciphers.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_set_default_digests.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_set_default_string.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_get_flags.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_unregister_DH.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_unregister_DSA.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_unregister_ECDH.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_unregister_ECDSA.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_unregister_RAND.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_unregister_STORE.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_unregister_ciphers.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_unregister_digests.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ERR_FATAL_ERROR.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ERR_GET_FUNC.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ERR_GET_REASON.3"
@@ -4456,6 +4255,8 @@ uninstall-local:
 	-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_cleanup.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_Cipher.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"
@@ -4466,6 +4267,8 @@ uninstall-local:
 	-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"
+	-rm -f "$(DESTDIR)$(mandir)/man3/OBJ_NAME_do_all.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/OBJ_NAME_do_all_sorted.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_meth_dup.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_meth_free.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_meth_set_cleanup.3"
@@ -4529,14 +4332,11 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_EncodeFinal.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_EncodeUpdate.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_copy.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_encrypting.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_free.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_init.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_new.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CIPHER_CTX_reset.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"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_CipherInit.3"
@@ -4583,18 +4383,6 @@ uninstall-local:
 	-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"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_meth_set_cleanup.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_meth_set_copy.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_meth_set_ctrl.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_meth_set_final.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_meth_set_flags.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_MD_meth_set_init.3"
-	-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"
@@ -4649,8 +4437,6 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_asn1_get0.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_asn1_get0_info.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_get0_asn1.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_asn1_add0.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_asn1_add_alias.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_asn1_copy.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_asn1_free.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_asn1_set_check.3"
@@ -4719,7 +4505,6 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_assign_DH.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_assign_DSA.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_assign_EC_KEY.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_assign_GOST.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_assign_RSA.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_base_id.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_PKEY_get0.3"
@@ -4752,11 +4537,6 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_VerifyFinal.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_VerifyInit_ex.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_VerifyUpdate.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_add_cipher_alias.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_add_digest.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_add_digest_alias.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_delete_cipher_alias.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_delete_digest_alias.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_aes_128_cbc_hmac_sha1.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_aes_128_ccm.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/EVP_aes_128_cfb.3"
@@ -4893,8 +4673,6 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/GENERAL_SUBTREE_new.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/NAME_CONSTRAINTS_free.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/OBJ_NAME_cleanup.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/OBJ_NAME_do_all.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/OBJ_NAME_do_all_sorted.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/OBJ_NAME_get.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/OBJ_NAME_init.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/OBJ_NAME_new_index.3"
@@ -4903,8 +4681,6 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/OBJ_cleanup.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/OBJ_create_objects.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/OBJ_new_nid.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/check_defer.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/obj_cleanup_defer.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/OBJ_find_sigid_by_algs.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/OBJ_cmp.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/OBJ_dup.3"
@@ -4986,7 +4762,6 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/OPENSSL_no_config.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/OPENSSL_init.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/ASN1_add_oid_module.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/ENGINE_add_conf_module.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/CRYPTO_free.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/CRYPTO_malloc.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/CRYPTO_realloc.3"
@@ -4998,7 +4773,6 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/sk_delete_ptr.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/sk_dup.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/sk_find.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/sk_find_ex.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/sk_free.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/sk_insert.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/sk_is_sorted.3"
@@ -5691,10 +5465,6 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/X509_CINF_free.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/X509_VAL_free.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/X509_VAL_new.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/X509_CRL_METHOD_free.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/X509_CRL_get_meth_data.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/X509_CRL_set_default_method.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/X509_CRL_set_meth_data.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/X509_CRL_add0_revoked.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/X509_CRL_get0_by_cert.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/X509_CRL_get_REVOKED.3"
@@ -5853,7 +5623,6 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/X509_STORE_CTX_set_chain.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/X509_STORE_CTX_trusted_stack.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/X509_STORE_CTX_get0_param.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/X509_STORE_CTX_purpose_inherit.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/X509_STORE_CTX_set0_param.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/X509_STORE_CTX_set_default.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/X509_STORE_CTX_set_depth.3"
@@ -5887,6 +5656,7 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/X509_STORE_add_crl.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/X509_STORE_get0_objects.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/X509_STORE_get0_param.3"
+	-rm -f "$(DESTDIR)$(mandir)/man3/X509_STORE_get1_objects.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/X509_STORE_get_ex_data.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/X509_STORE_get_ex_new_index.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/X509_STORE_set_depth.3"
@@ -6080,32 +5850,18 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/X509v3_get_ext_by_critical.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/X509v3_get_ext_count.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/bn_add_words.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/bn_check_top.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/bn_cmp_words.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/bn_div_words.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/bn_expand.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/bn_expand2.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/bn_fix_top.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/bn_mul_add_words.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/bn_mul_comba4.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/bn_mul_comba8.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/bn_mul_normal.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/bn_mul_part_recursive.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/bn_mul_recursive.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/bn_mul_words.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/bn_set_high.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/bn_set_low.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/bn_set_max.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/bn_sqr_comba4.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/bn_sqr_comba8.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/bn_sqr_normal.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/bn_sqr_recursive.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/bn_sqr_words.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/bn_sub_words.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/bn_wexpand.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/mul.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/mul_add.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/sqr.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/i2d_ASN1_NULL.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/OBJ_get0_data.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/OBJ_length.3"
@@ -6444,11 +6200,6 @@ uninstall-local:
 	-rm -f "$(DESTDIR)$(mandir)/man3/lh_insert.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/lh_retrieve.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/lh_strhash.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/lh_node_stats.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/lh_node_stats_bio.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/lh_node_usage_stats.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/lh_node_usage_stats_bio.3"
-	-rm -f "$(DESTDIR)$(mandir)/man3/lh_stats_bio.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/i2s_ASN1_ENUMERATED.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/i2s_ASN1_ENUMERATED_TABLE.3"
 	-rm -f "$(DESTDIR)$(mandir)/man3/i2s_ASN1_INTEGER.3"
diff --git a/tls_conninfo.c b/tls_conninfo.c
index b2aadab..90fdfac 100644
--- a/tls_conninfo.c
+++ b/tls_conninfo.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls_conninfo.c,v 1.23 2023/05/14 07:26:25 op Exp $ */
+/* $OpenBSD: tls_conninfo.c,v 1.24 2023/11/13 10:51:49 tb Exp $ */
 /*
  * Copyright (c) 2015 Joel Sing <jsing@openbsd.org>
  * Copyright (c) 2015 Bob Beck <beck@openbsd.org>
@@ -117,9 +117,9 @@ tls_get_peer_cert_times(struct tls *ctx, time_t *notbefore,
 		goto err;
 	if ((after = X509_get_notAfter(ctx->ssl_peer_cert)) == NULL)
 		goto err;
-	if (ASN1_time_parse(before->data, before->length, &before_tm, 0) == -1)
+	if (!ASN1_TIME_to_tm(before, &before_tm))
 		goto err;
-	if (ASN1_time_parse(after->data, after->length, &after_tm, 0) == -1)
+	if (!ASN1_TIME_to_tm(after, &after_tm))
 		goto err;
 	if (!ASN1_time_tm_clamp_notafter(&after_tm))
 		goto err;
diff --git a/tls_ocsp.c b/tls_ocsp.c
index acf6935..c7eb3e5 100644
--- a/tls_ocsp.c
+++ b/tls_ocsp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tls_ocsp.c,v 1.23 2023/05/14 07:26:25 op Exp $ */
+/*	$OpenBSD: tls_ocsp.c,v 1.24 2023/11/13 10:56:19 tb Exp $ */
 /*
  * Copyright (c) 2015 Marko Kreen <markokr@gmail.com>
  * Copyright (c) 2016 Bob Beck <beck@openbsd.org>
@@ -64,8 +64,9 @@ tls_ocsp_asn1_parse_time(struct tls *ctx, ASN1_GENERALIZEDTIME *gt, time_t *gt_t
 	if (gt == NULL)
 		return -1;
 	/* RFC 6960 specifies that all times in OCSP must be GENERALIZEDTIME */
-	if (ASN1_time_parse(gt->data, gt->length, &tm,
-		V_ASN1_GENERALIZEDTIME) == -1)
+	if (!ASN1_GENERALIZEDTIME_check(gt))
+		return -1;
+	if (!ASN1_TIME_to_tm(gt, &tm))
 		return -1;
 	if ((*gt_time = timegm(&tm)) == -1)
 		return -1;
diff --git a/tls_verify.c b/tls_verify.c
index c588f02..a35ebe0 100644
--- a/tls_verify.c
+++ b/tls_verify.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls_verify.c,v 1.28 2023/06/01 07:32:25 tb Exp $ */
+/* $OpenBSD: tls_verify.c,v 1.29 2023/11/22 18:23:09 op Exp $ */
 /*
  * Copyright (c) 2014 Jeremie Courreges-Anglas <jca@openbsd.org>
  *
@@ -244,7 +244,7 @@ tls_check_common_name(struct tls *ctx, X509 *cert, const char *name,
 		 * certificate as hostile.
 		 */
 		tls_set_errorx(ctx, "error verifying name '%s': "
-		    "Certificate subject contains mutiple Common Name fields, "
+		    "Certificate subject contains multiple Common Name fields, "
 		    "probably a malicious or malformed certificate", name);
 		goto err;
 	}

 

generated by cgit-pink 1.4.1 (git 2.36.1) at 2026-06-04 03:15:23 +0000