2 files changed, 34 insertions, 63 deletions

diff --git a/crypto/openssh/config.h b/crypto/openssh/config.h
index 7d08bce490e4..17d7e53666e9 100644
--- a/crypto/openssh/config.h
+++ b/crypto/openssh/config.h
@@ -395,19 +395,19 @@
 /* #undef HAVE_DEV_PTS_AND_PTC */
 
 /* Define if libcrypto has DH_get0_key */
-/* #undef HAVE_DH_GET0_KEY */
+#define HAVE_DH_GET0_KEY 1
 
 /* Define if libcrypto has DH_get0_pqg */
-/* #undef HAVE_DH_GET0_PQG */
+#define HAVE_DH_GET0_PQG 1
 
 /* Define if libcrypto has DH_set0_key */
-/* #undef HAVE_DH_SET0_KEY */
+#define HAVE_DH_SET0_KEY 1
 
 /* Define if libcrypto has DH_set0_pqg */
-/* #undef HAVE_DH_SET0_PQG */
+#define HAVE_DH_SET0_PQG 1
 
 /* Define if libcrypto has DH_set_length */
-/* #undef HAVE_DH_SET_LENGTH */
+#define HAVE_DH_SET_LENGTH 1
 
 /* Define to 1 if you have the <dirent.h> header file. */
 #define HAVE_DIRENT_H 1
@@ -422,28 +422,28 @@
 #define HAVE_DSA_GENERATE_PARAMETERS_EX 1
 
 /* Define if libcrypto has DSA_get0_key */
-/* #undef HAVE_DSA_GET0_KEY */
+#define HAVE_DSA_GET0_KEY 1
 
 /* Define if libcrypto has DSA_get0_pqg */
-/* #undef HAVE_DSA_GET0_PQG */
+#define HAVE_DSA_GET0_PQG 1
 
 /* Define if libcrypto has DSA_set0_key */
-/* #undef HAVE_DSA_SET0_KEY */
+#define HAVE_DSA_SET0_KEY 1
 
 /* Define if libcrypto has DSA_set0_pqg */
-/* #undef HAVE_DSA_SET0_PQG */
+#define HAVE_DSA_SET0_PQG 1
 
 /* Define if libcrypto has DSA_SIG_get0 */
-/* #undef HAVE_DSA_SIG_GET0 */
+#define HAVE_DSA_SIG_GET0 1
 
 /* Define if libcrypto has DSA_SIG_set0 */
-/* #undef HAVE_DSA_SIG_SET0 */
+#define HAVE_DSA_SIG_SET0 1
 
 /* Define if libcrypto has ECDSA_SIG_get0 */
-/* #undef HAVE_ECDSA_SIG_GET0 */
+#define HAVE_ECDSA_SIG_GET0 1
 
 /* Define if libcrypto has ECDSA_SIG_set0 */
-/* #undef HAVE_ECDSA_SIG_SET0 */
+#define HAVE_ECDSA_SIG_SET0 1
 
 /* Define to 1 if you have the <elf.h> header file. */
 #define HAVE_ELF_H 1
@@ -479,10 +479,10 @@
 /* #undef HAVE_EVP_CIPHER_CTX_GET_IV */
 
 /* Define if libcrypto has EVP_CIPHER_CTX_iv */
-/* #undef HAVE_EVP_CIPHER_CTX_IV */
+#define HAVE_EVP_CIPHER_CTX_IV 1
 
 /* Define if libcrypto has EVP_CIPHER_CTX_iv_noconst */
-/* #undef HAVE_EVP_CIPHER_CTX_IV_NOCONST */
+#define HAVE_EVP_CIPHER_CTX_IV_NOCONST 1
 
 /* Define to 1 if you have the `EVP_DigestFinal_ex' function. */
 #define HAVE_EVP_DIGESTFINAL_EX 1
@@ -491,22 +491,22 @@
 #define HAVE_EVP_DIGESTINIT_EX 1
 
 /* Define to 1 if you have the `EVP_MD_CTX_cleanup' function. */
-#define HAVE_EVP_MD_CTX_CLEANUP 1
+/* #undef HAVE_EVP_MD_CTX_CLEANUP */
 
 /* Define to 1 if you have the `EVP_MD_CTX_copy_ex' function. */
 #define HAVE_EVP_MD_CTX_COPY_EX 1
 
 /* Define if libcrypto has EVP_MD_CTX_free */
-/* #undef HAVE_EVP_MD_CTX_FREE */
+#define HAVE_EVP_MD_CTX_FREE 1
 
 /* Define to 1 if you have the `EVP_MD_CTX_init' function. */
-#define HAVE_EVP_MD_CTX_INIT 1
+/* #undef HAVE_EVP_MD_CTX_INIT */
 
 /* Define if libcrypto has EVP_MD_CTX_new */
-/* #undef HAVE_EVP_MD_CTX_NEW */
+#define HAVE_EVP_MD_CTX_NEW 1
 
 /* Define if libcrypto has EVP_PKEY_get0_RSA */
-/* #undef HAVE_EVP_PKEY_GET0_RSA */
+#define HAVE_EVP_PKEY_GET0_RSA 1
 
 /* Define to 1 if you have the `EVP_ripemd160' function. */
 #define HAVE_EVP_RIPEMD160 1
@@ -704,7 +704,7 @@
 #define HAVE_HEADER_AD 1
 
 /* Define to 1 if you have the `HMAC_CTX_init' function. */
-#define HAVE_HMAC_CTX_INIT 1
+/* #undef HAVE_HMAC_CTX_INIT */
 
 /* Define if you have ut_host in utmp.h */
 /* #undef HAVE_HOST_IN_UTMP */
@@ -1031,46 +1031,46 @@
 #define HAVE_RSA_GENERATE_KEY_EX 1
 
 /* Define if libcrypto has RSA_get0_crt_params */
-/* #undef HAVE_RSA_GET0_CRT_PARAMS */
+#define HAVE_RSA_GET0_CRT_PARAMS 1
 
 /* Define if libcrypto has RSA_get0_factors */
-/* #undef HAVE_RSA_GET0_FACTORS */
+#define HAVE_RSA_GET0_FACTORS 1
 
 /* Define if libcrypto has RSA_get0_key */
-/* #undef HAVE_RSA_GET0_KEY */
+#define HAVE_RSA_GET0_KEY 1
 
 /* Define to 1 if you have the `RSA_get_default_method' function. */
 #define HAVE_RSA_GET_DEFAULT_METHOD 1
 
 /* Define if libcrypto has RSA_meth_dup */
-/* #undef HAVE_RSA_METH_DUP */
+#define HAVE_RSA_METH_DUP 1
 
 /* Define if libcrypto has RSA_meth_free */
-/* #undef HAVE_RSA_METH_FREE */
+#define HAVE_RSA_METH_FREE 1
 
 /* Define if libcrypto has RSA_meth_get_finish */
-/* #undef HAVE_RSA_METH_GET_FINISH */
+#define HAVE_RSA_METH_GET_FINISH 1
 
 /* Define if libcrypto has RSA_meth_set1_name */
-/* #undef HAVE_RSA_METH_SET1_NAME */
+#define HAVE_RSA_METH_SET1_NAME 1
 
 /* Define if libcrypto has RSA_meth_set_finish */
-/* #undef HAVE_RSA_METH_SET_FINISH */
+#define HAVE_RSA_METH_SET_FINISH 1
 
 /* Define if libcrypto has RSA_meth_set_priv_dec */
-/* #undef HAVE_RSA_METH_SET_PRIV_DEC */
+#define HAVE_RSA_METH_SET_PRIV_DEC 1
 
 /* Define if libcrypto has RSA_meth_set_priv_enc */
-/* #undef HAVE_RSA_METH_SET_PRIV_ENC */
+#define HAVE_RSA_METH_SET_PRIV_ENC 1
 
 /* Define if libcrypto has RSA_get0_srt_params */
-/* #undef HAVE_RSA_SET0_CRT_PARAMS */
+#define HAVE_RSA_SET0_CRT_PARAMS 1
 
 /* Define if libcrypto has RSA_set0_factors */
-/* #undef HAVE_RSA_SET0_FACTORS */
+#define HAVE_RSA_SET0_FACTORS 1
 
 /* Define if libcrypto has RSA_set0_key */
-/* #undef HAVE_RSA_SET0_KEY */
+#define HAVE_RSA_SET0_KEY 1
 
 /* Define to 1 if you have the <sandbox.h> header file. */
 /* #undef HAVE_SANDBOX_H */
diff --git a/crypto/openssh/ssh_namespace.h b/crypto/openssh/ssh_namespace.h
index c14e9a87b036..2f839fee0721 100644
--- a/crypto/openssh/ssh_namespace.h
+++ b/crypto/openssh/ssh_namespace.h
@@ -8,37 +8,8 @@
 #define Blowfish_expandstate			Fssh_Blowfish_expandstate
 #define Blowfish_initstate			Fssh_Blowfish_initstate
 #define Blowfish_stream2word			Fssh_Blowfish_stream2word
-#define DH_get0_key				Fssh_DH_get0_key
-#define DH_get0_pqg				Fssh_DH_get0_pqg
-#define DH_set0_key				Fssh_DH_set0_key
-#define DH_set0_pqg				Fssh_DH_set0_pqg
-#define DH_set_length				Fssh_DH_set_length
-#define DSA_SIG_get0				Fssh_DSA_SIG_get0
-#define DSA_SIG_set0				Fssh_DSA_SIG_set0
-#define DSA_get0_key				Fssh_DSA_get0_key
-#define DSA_get0_pqg				Fssh_DSA_get0_pqg
-#define DSA_set0_key				Fssh_DSA_set0_key
-#define DSA_set0_pqg				Fssh_DSA_set0_pqg
-#define ECDSA_SIG_get0				Fssh_ECDSA_SIG_get0
-#define ECDSA_SIG_set0				Fssh_ECDSA_SIG_set0
 #define EVP_CIPHER_CTX_get_iv			Fssh_EVP_CIPHER_CTX_get_iv
 #define EVP_CIPHER_CTX_set_iv			Fssh_EVP_CIPHER_CTX_set_iv
-#define EVP_MD_CTX_free				Fssh_EVP_MD_CTX_free
-#define EVP_MD_CTX_new				Fssh_EVP_MD_CTX_new
-#define EVP_PKEY_get0_RSA			Fssh_EVP_PKEY_get0_RSA
-#define RSA_get0_crt_params			Fssh_RSA_get0_crt_params
-#define RSA_get0_factors			Fssh_RSA_get0_factors
-#define RSA_get0_key				Fssh_RSA_get0_key
-#define RSA_meth_dup				Fssh_RSA_meth_dup
-#define RSA_meth_free				Fssh_RSA_meth_free
-#define RSA_meth_get_finish			Fssh_RSA_meth_get_finish
-#define RSA_meth_set1_name			Fssh_RSA_meth_set1_name
-#define RSA_meth_set_finish			Fssh_RSA_meth_set_finish
-#define RSA_meth_set_priv_dec			Fssh_RSA_meth_set_priv_dec
-#define RSA_meth_set_priv_enc			Fssh_RSA_meth_set_priv_enc
-#define RSA_set0_crt_params			Fssh_RSA_set0_crt_params
-#define RSA_set0_factors			Fssh_RSA_set0_factors
-#define RSA_set0_key				Fssh_RSA_set0_key
 #define _ssh__compat_glob			Fssh__ssh__compat_glob
 #define _ssh__compat_globfree			Fssh__ssh__compat_globfree
 #define _ssh_compat_realpath			Fssh__ssh_compat_realpath