aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2011-11-10 14:46:22 +0100
committerAndreas Schneider <asn@cryptomilk.org>2011-11-10 14:46:22 +0100
commitce0324770d6e8b73abc231c8d3016807d04ed0b3 (patch)
tree1da47dc35a32267342fa7b17cb354d714aa1b8c9
parentbc2ab9b41449dee287beeb1417dbd08e119b0536 (diff)
downloadlibssh-ce0324770d6e8b73abc231c8d3016807d04ed0b3.tar.gz
libssh-ce0324770d6e8b73abc231c8d3016807d04ed0b3.tar.xz
libssh-ce0324770d6e8b73abc231c8d3016807d04ed0b3.zip
kex: Fix some build warnings.
-rw-r--r--include/libssh/kex.h2
-rw-r--r--src/kex.c2
-rw-r--r--src/server.c3
3 files changed, 4 insertions, 3 deletions
diff --git a/include/libssh/kex.h b/include/libssh/kex.h
index 693d8006..67a20061 100644
--- a/include/libssh/kex.h
+++ b/include/libssh/kex.h
@@ -37,7 +37,9 @@ SSH_PACKET_CALLBACK(ssh_packet_kexinit);
SSH_PACKET_CALLBACK(ssh_packet_publickey1);
#endif
+extern const char *supported_methods[];
extern const char *ssh_kex_nums[];
+
int ssh_send_kex(ssh_session session, int server_kex);
void ssh_list_kex(ssh_session session, struct ssh_kex_struct *kex);
int set_client_kex(ssh_session session);
diff --git a/src/kex.c b/src/kex.c
index 096d7a07..bf553a12 100644
--- a/src/kex.c
+++ b/src/kex.c
@@ -70,7 +70,7 @@
#define KEY_EXCHANGE "diffie-hellman-group1-sha1"
#endif
-const char *default_methods[] = {
+static const char *default_methods[] = {
KEY_EXCHANGE,
"ssh-rsa,ssh-dss",
AES BLOWFISH DES,
diff --git a/src/server.c b/src/server.c
index a14d66e1..3f7721bb 100644
--- a/src/server.c
+++ b/src/server.c
@@ -52,6 +52,7 @@
#include "libssh/packet.h"
#include "libssh/socket.h"
#include "libssh/session.h"
+#include "libssh/kex.h"
#include "libssh/misc.h"
#include "libssh/pki.h"
#include "libssh/dh.h"
@@ -72,8 +73,6 @@ static int dh_handshake_server(ssh_session session);
* @{
*/
-extern const char *supported_methods[];
-
/** @internal
* This functions sets the Key Exchange protocols to be accepted
* by the server. They depend on