From 7ca95beaf3b73355ee1227a46f73d269197851a2 Mon Sep 17 00:00:00 2001 From: Fabiano FidĂȘncio Date: Thu, 17 Sep 2015 10:26:05 +0200 Subject: cleanup: use ssh_ prefix in the dh (non-static) functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Having "ssh_" prefix in the functions' name will avoid possible clashes when compiling libssh statically. Signed-off-by: Fabiano FidĂȘncio --- include/libssh/dh.h | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'include/libssh') diff --git a/include/libssh/dh.h b/include/libssh/dh.h index 95b76cdd..8e0d5aa6 100644 --- a/include/libssh/dh.h +++ b/include/libssh/dh.h @@ -25,27 +25,27 @@ #include "libssh/crypto.h" -int dh_generate_e(ssh_session session); -int dh_generate_f(ssh_session session); -int dh_generate_x(ssh_session session); -int dh_generate_y(ssh_session session); +int ssh_dh_generate_e(ssh_session session); +int ssh_dh_generate_f(ssh_session session); +int ssh_dh_generate_x(ssh_session session); +int ssh_dh_generate_y(ssh_session session); int ssh_crypto_init(void); void ssh_crypto_finalize(void); -ssh_string dh_get_e(ssh_session session); -ssh_string dh_get_f(ssh_session session); -int dh_import_f(ssh_session session,ssh_string f_string); -int dh_import_e(ssh_session session, ssh_string e_string); -void dh_import_pubkey(ssh_session session,ssh_string pubkey_string); -int dh_build_k(ssh_session session); +ssh_string ssh_dh_get_e(ssh_session session); +ssh_string ssh_dh_get_f(ssh_session session); +int ssh_dh_import_f(ssh_session session,ssh_string f_string); +int ssh_dh_import_e(ssh_session session, ssh_string e_string); +void ssh_dh_import_pubkey(ssh_session session,ssh_string pubkey_string); +int ssh_dh_build_k(ssh_session session); int ssh_client_dh_init(ssh_session session); int ssh_client_dh_reply(ssh_session session, ssh_buffer packet); -int make_sessionid(ssh_session session); +int ssh_make_sessionid(ssh_session session); /* add data for the final cookie */ -int hashbufin_add_cookie(ssh_session session, unsigned char *cookie); -int hashbufout_add_cookie(ssh_session session); -int generate_session_keys(ssh_session session); +int ssh_hashbufin_add_cookie(ssh_session session, unsigned char *cookie); +int ssh_hashbufout_add_cookie(ssh_session session); +int ssh_generate_session_keys(ssh_session session); #endif /* DH_H_ */ -- cgit