aboutsummaryrefslogtreecommitdiff
path: root/libssh
diff options
context:
space:
mode:
authorAris Adamantiadis <aris@0xbadc0de.be>2009-09-26 00:29:53 +0200
committerAris Adamantiadis <aris@0xbadc0de.be>2009-09-26 00:29:53 +0200
commit3a8d839e8604bf66c04ad0b46e51402428a88b1a (patch)
treed4b3e09a967ebd723bec679311c29399dc58636a /libssh
parent358647f5d9df24fc55f670a343152fd277416266 (diff)
downloadlibssh-3a8d839e8604bf66c04ad0b46e51402428a88b1a.tar.gz
libssh-3a8d839e8604bf66c04ad0b46e51402428a88b1a.tar.xz
libssh-3a8d839e8604bf66c04ad0b46e51402428a88b1a.zip
More include file movings
Diffstat (limited to 'libssh')
-rw-r--r--libssh/auth.c1
-rw-r--r--libssh/client.c1
-rw-r--r--libssh/config.c1
-rw-r--r--libssh/crypt.c2
-rw-r--r--libssh/dh.c3
-rw-r--r--libssh/kex.c2
-rw-r--r--libssh/keyfiles.c6
-rw-r--r--libssh/log.c1
-rw-r--r--libssh/options.c2
-rw-r--r--libssh/server.c3
-rw-r--r--libssh/session.c3
-rw-r--r--libssh/wrapper.c4
12 files changed, 28 insertions, 1 deletions
diff --git a/libssh/auth.c b/libssh/auth.c
index e16f344..36e06ae 100644
--- a/libssh/auth.c
+++ b/libssh/auth.c
@@ -37,6 +37,7 @@
#include "libssh/keyfiles.h"
#include "libssh/packet.h"
#include "libssh/session.h"
+#include "libssh/options.h"
/** \defgroup ssh_auth SSH Authentication functions
* \brief functions to authenticate to servers
diff --git a/libssh/client.c b/libssh/client.c
index 1c69e15..3ff92da 100644
--- a/libssh/client.c
+++ b/libssh/client.c
@@ -35,6 +35,7 @@
#include "libssh/packet.h"
#include "libssh/socket.h"
#include "libssh/session.h"
+#include "libssh/options.h"
#define set_status(opt,status) do {\
if (opt->callbacks && opt->callbacks->connect_status_function) \
diff --git a/libssh/config.c b/libssh/config.c
index 85f4c72..b9118e6 100644
--- a/libssh/config.c
+++ b/libssh/config.c
@@ -26,6 +26,7 @@
#include <string.h>
#include "libssh/priv.h"
+#include "libssh/options.h"
enum ssh_config_opcode_e {
SOC_UNSUPPORTED = -1,
diff --git a/libssh/crypt.c b/libssh/crypt.c
index 498a5ea..172d215 100644
--- a/libssh/crypt.c
+++ b/libssh/crypt.c
@@ -21,6 +21,7 @@
* MA 02111-1307, USA.
*/
+#include "config.h"
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -38,6 +39,7 @@
#include "libssh/priv.h"
#include "libssh/crypto.h"
#include "libssh/session.h"
+#include "libssh/wrapper.h"
uint32_t packet_decrypt_len(ssh_session session, char *crypted){
uint32_t decrypted;
diff --git a/libssh/dh.c b/libssh/dh.c
index c1845d7..4f05251 100644
--- a/libssh/dh.c
+++ b/libssh/dh.c
@@ -40,6 +40,7 @@
* if everything went correctly, k and k' are equal
*/
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -52,6 +53,8 @@
#include "libssh/crypto.h"
#include "libssh/buffer.h"
#include "libssh/session.h"
+#include "libssh/options.h"
+
/* todo: remove it */
#include "libssh/string.h"
#ifdef HAVE_LIBCRYPTO
diff --git a/libssh/kex.c b/libssh/kex.c
index 1d39901..ded0247 100644
--- a/libssh/kex.c
+++ b/libssh/kex.c
@@ -37,6 +37,8 @@
#include "libssh/buffer.h"
#include "libssh/packet.h"
#include "libssh/session.h"
+#include "libssh/wrapper.h"
+#include "libssh/options.h"
#ifdef HAVE_LIBGCRYPT
#define BLOWFISH "blowfish-cbc,"
diff --git a/libssh/keyfiles.c b/libssh/keyfiles.c
index cb3edd2..7ac1161 100644
--- a/libssh/keyfiles.c
+++ b/libssh/keyfiles.c
@@ -22,6 +22,8 @@
* MA 02111-1307, USA.
*/
+#include "config.h"
+
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
@@ -39,9 +41,13 @@
#include "libssh/buffer.h"
#include "libssh/keyfiles.h"
#include "libssh/session.h"
+#include "libssh/wrapper.h"
+#include "libssh/options.h"
+
/*todo: remove this include */
#include "libssh/string.h"
+
#ifdef HAVE_LIBGCRYPT
#include <gcrypt.h>
#elif defined HAVE_LIBCRYPTO
diff --git a/libssh/log.c b/libssh/log.c
index 2e1c0db..d119f54 100644
--- a/libssh/log.c
+++ b/libssh/log.c
@@ -27,6 +27,7 @@
#include "libssh/priv.h"
#include "libssh/session.h"
+#include "libssh/options.h"
/**
* @defgroup ssh_log SSH Logging
diff --git a/libssh/options.c b/libssh/options.c
index 63156c5..275f9fe 100644
--- a/libssh/options.c
+++ b/libssh/options.c
@@ -22,6 +22,7 @@
* MA 02111-1307, USA.
*/
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -32,6 +33,7 @@
#endif
#include <sys/types.h>
#include "libssh/priv.h"
+#include "libssh/options.h"
/** \defgroup ssh_options SSH Options
* \brief options settings for a new SSH session
diff --git a/libssh/server.c b/libssh/server.c
index 5a89c93..1eb09d5 100644
--- a/libssh/server.c
+++ b/libssh/server.c
@@ -27,6 +27,8 @@
* @{
*/
+#include "config.h"
+
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
@@ -43,6 +45,7 @@
#include "libssh/socket.h"
#include "libssh/channels.h"
#include "libssh/session.h"
+#include "libssh/options.h"
#ifdef _WIN32
diff --git a/libssh/session.c b/libssh/session.c
index 5f48023..9b646a8 100644
--- a/libssh/session.c
+++ b/libssh/session.c
@@ -21,6 +21,7 @@
* MA 02111-1307, USA.
*/
+#include "config.h"
#include <string.h>
#include <stdlib.h>
#include "libssh/libssh.h"
@@ -31,6 +32,8 @@
#include "libssh/agent.h"
#include "libssh/packet.h"
#include "libssh/session.h"
+#include "libssh/options.h"
+
#define FIRST_CHANNEL 42 // why not ? it helps to find bugs.
diff --git a/libssh/wrapper.c b/libssh/wrapper.c
index 2dc67e1..4cfc71b 100644
--- a/libssh/wrapper.c
+++ b/libssh/wrapper.c
@@ -31,17 +31,19 @@
* are welcome.
*/
+#include "config.h"
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include "libssh/priv.h"
#include "libssh/session.h"
+#include "libssh/crypto.h"
+#include "libssh/wrapper.h"
#ifdef HAVE_LIBGCRYPT
#include <gcrypt.h>
-#include "libssh/crypto.h"
static int alloc_key(struct crypto_struct *cipher) {
cipher->key = malloc(cipher->keylen);