1 files changed, 35 insertions, 5 deletions

diff --git a/crypto/openssh/ssh_namespace.h b/crypto/openssh/ssh_namespace.h
index db0be7350b153..c14e9a87b036b 100644
--- a/crypto/openssh/ssh_namespace.h
+++ b/crypto/openssh/ssh_namespace.h
@@ -8,6 +8,37 @@
 #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
@@ -166,7 +197,6 @@
 #define cipher_crypt				Fssh_cipher_crypt
 #define cipher_ctx_is_plaintext			Fssh_cipher_ctx_is_plaintext
 #define cipher_free				Fssh_cipher_free
-#define cipher_get_keycontext			Fssh_cipher_get_keycontext
 #define cipher_get_keyiv			Fssh_cipher_get_keyiv
 #define cipher_get_keyiv_len			Fssh_cipher_get_keyiv_len
 #define cipher_get_length			Fssh_cipher_get_length
@@ -175,7 +205,6 @@
 #define cipher_ivlen				Fssh_cipher_ivlen
 #define cipher_keylen				Fssh_cipher_keylen
 #define cipher_seclen				Fssh_cipher_seclen
-#define cipher_set_keycontext			Fssh_cipher_set_keycontext
 #define cipher_set_keyiv			Fssh_cipher_set_keyiv
 #define cipher_warning_message			Fssh_cipher_warning_message
 #define ciphers_valid				Fssh_ciphers_valid
@@ -630,7 +659,7 @@
 #define ssh_remove_all_identities		Fssh_ssh_remove_all_identities
 #define ssh_remove_identity			Fssh_ssh_remove_identity
 #define ssh_request_reply			Fssh_ssh_request_reply
-#define ssh_rsa_generate_additional_parameters	Fssh_ssh_rsa_generate_additional_parameters
+#define ssh_rsa_complete_crt_parameters		Fssh_ssh_rsa_complete_crt_parameters
 #define ssh_rsa_sign				Fssh_ssh_rsa_sign
 #define ssh_rsa_verify				Fssh_ssh_rsa_verify
 #define ssh_set_app_data			Fssh_ssh_set_app_data
@@ -652,6 +681,7 @@
 #define sshbuf_dump_data			Fssh_sshbuf_dump_data
 #define sshbuf_dup_string			Fssh_sshbuf_dup_string
 #define sshbuf_free				Fssh_sshbuf_free
+#define sshbuf_free_passwd			Fssh_sshbuf_free_passwd
 #define sshbuf_from				Fssh_sshbuf_from
 #define sshbuf_fromb				Fssh_sshbuf_fromb
 #define sshbuf_froms				Fssh_sshbuf_froms
@@ -662,6 +692,7 @@
 #define sshbuf_get_cstring			Fssh_sshbuf_get_cstring
 #define sshbuf_get_ec				Fssh_sshbuf_get_ec
 #define sshbuf_get_eckey			Fssh_sshbuf_get_eckey
+#define sshbuf_get_passwd			Fssh_sshbuf_get_passwd
 #define sshbuf_get_string			Fssh_sshbuf_get_string
 #define sshbuf_get_string_direct		Fssh_sshbuf_get_string_direct
 #define sshbuf_get_stringb			Fssh_sshbuf_get_stringb
@@ -683,6 +714,7 @@
 #define sshbuf_put_cstring			Fssh_sshbuf_put_cstring
 #define sshbuf_put_ec				Fssh_sshbuf_put_ec
 #define sshbuf_put_eckey			Fssh_sshbuf_put_eckey
+#define sshbuf_put_passwd			Fssh_sshbuf_put_passwd
 #define sshbuf_put_string			Fssh_sshbuf_put_string
 #define sshbuf_put_stringb			Fssh_sshbuf_put_stringb
 #define sshbuf_put_u16				Fssh_sshbuf_put_u16
@@ -697,7 +729,6 @@
 #define sshbuf_reset				Fssh_sshbuf_reset
 #define sshbuf_set_max_size			Fssh_sshbuf_set_max_size
 #define sshbuf_set_parent			Fssh_sshbuf_set_parent
-#define sshkey_add_private			Fssh_sshkey_add_private
 #define sshkey_alg_list				Fssh_sshkey_alg_list
 #define sshkey_cert_check_authority		Fssh_sshkey_cert_check_authority
 #define sshkey_cert_copy			Fssh_sshkey_cert_copy
@@ -709,7 +740,6 @@
 #define sshkey_curve_name_to_nid		Fssh_sshkey_curve_name_to_nid
 #define sshkey_curve_nid_to_bits		Fssh_sshkey_curve_nid_to_bits
 #define sshkey_curve_nid_to_name		Fssh_sshkey_curve_nid_to_name
-#define sshkey_demote				Fssh_sshkey_demote
 #define sshkey_drop_cert			Fssh_sshkey_drop_cert
 #define sshkey_dump_ec_key			Fssh_sshkey_dump_ec_key
 #define sshkey_dump_ec_point			Fssh_sshkey_dump_ec_point