diff options
| -rw-r--r-- | include/libssh/dh.h | 2 | ||||
| -rw-r--r-- | include/libssh/pki.h | 2 | ||||
| -rw-r--r-- | include/libssh/priv.h | 1 | ||||
| -rw-r--r-- | include/libssh/wrapper.h | 1 | ||||
| -rw-r--r-- | src/auth.c | 1 | ||||
| -rw-r--r-- | src/config.c | 3 | ||||
| -rw-r--r-- | src/getpass.c | 1 | ||||
| -rw-r--r-- | src/gzip.c | 8 | ||||
| -rw-r--r-- | src/pcap.c | 1 | ||||
| -rw-r--r-- | src/poll.c | 1 | ||||
| -rw-r--r-- | src/scp.c | 3 | ||||
| -rw-r--r-- | src/session.c | 5 | ||||
| -rw-r--r-- | src/threads.c | 3 |
13 files changed, 26 insertions, 6 deletions
diff --git a/include/libssh/dh.h b/include/libssh/dh.h index c82cba79..fcdaaf46 100644 --- a/include/libssh/dh.h +++ b/include/libssh/dh.h @@ -24,6 +24,8 @@ #include "config.h" +#include "libssh/crypto.h" + void ssh_print_bignum(const char *which,bignum num); int dh_generate_e(ssh_session session); int dh_generate_f(ssh_session session); diff --git a/include/libssh/pki.h b/include/libssh/pki.h index d4cc8503..ad8bdb0e 100644 --- a/include/libssh/pki.h +++ b/include/libssh/pki.h @@ -22,6 +22,8 @@ #ifndef PKI_H_ #define PKI_H_ +#include "libssh/crypto.h" + #define SSH_KEY_FLAG_EMPTY 0x0 #define SSH_KEY_FLAG_PUBLIC 0x0001 #define SSH_KEY_FLAG_PRIVATE 0x0002 diff --git a/include/libssh/priv.h b/include/libssh/priv.h index 6d8eeb43..522f56bf 100644 --- a/include/libssh/priv.h +++ b/include/libssh/priv.h @@ -105,7 +105,6 @@ int gettimeofday(struct timeval *__p, void *__t); #include "libssh/libssh.h" #include "libssh/callbacks.h" -#include "libssh/crypto.h" /* some constants */ #define MAX_PACKET_LEN 262144 diff --git a/include/libssh/wrapper.h b/include/libssh/wrapper.h index 7fe6f8ad..c08ab22a 100644 --- a/include/libssh/wrapper.h +++ b/include/libssh/wrapper.h @@ -25,7 +25,6 @@ #include "config.h" #include "libssh/libcrypto.h" #include "libssh/libgcrypt.h" -#include "libssh/crypto.h" enum ssh_mac_e { SSH_MAC_SHA1=1, @@ -31,6 +31,7 @@ #endif #include "libssh/priv.h" +#include "libssh/crypto.h" #include "libssh/ssh2.h" #include "libssh/buffer.h" #include "libssh/agent.h" diff --git a/src/config.c b/src/config.c index 67111c79..d9a95a23 100644 --- a/src/config.c +++ b/src/config.c @@ -21,9 +21,12 @@ * MA 02111-1307, USA. */ +#include "config.h" + #include <ctype.h> #include <stdio.h> #include <string.h> +#include <stdlib.h> #include "libssh/priv.h" #include "libssh/session.h" diff --git a/src/getpass.c b/src/getpass.c index 62f323e6..0bb6a9a9 100644 --- a/src/getpass.c +++ b/src/getpass.c @@ -23,6 +23,7 @@ #include <stdio.h> #include <string.h> +#include <stdlib.h> #include <libssh/priv.h> @@ -23,9 +23,6 @@ */ #include "config.h" -#include "libssh/priv.h" -#include "libssh/buffer.h" -#include "libssh/session.h" #if defined(HAVE_LIBZ) && defined(WITH_LIBZ) @@ -33,6 +30,11 @@ #include <string.h> #include <stdlib.h> +#include "libssh/priv.h" +#include "libssh/buffer.h" +#include "libssh/crypto.h" +#include "libssh/session.h" + #define BLOCKSIZE 4092 static z_stream *initcompress(ssh_session session, int level) { @@ -32,6 +32,7 @@ #include <sys/socket.h> #endif #include <errno.h> +#include <stdlib.h> #include "libssh/libssh.h" #include "libssh/pcap.h" @@ -28,6 +28,7 @@ #include "config.h" #include <errno.h> +#include <stdlib.h> #include "libssh/priv.h" #include "libssh/libssh.h" @@ -21,8 +21,11 @@ * MA 02111-1307, USA. */ +#include "config.h" + #include <stdio.h> #include <string.h> +#include <stdlib.h> #include "libssh/priv.h" #include "libssh/scp.h" diff --git a/src/session.c b/src/session.c index 34465dfa..1a11ab58 100644 --- a/src/session.c +++ b/src/session.c @@ -22,10 +22,13 @@ */ #include "config.h" + #include <string.h> #include <stdlib.h> -#include "libssh/libssh.h" + #include "libssh/priv.h" +#include "libssh/libssh.h" +#include "libssh/crypto.h" #include "libssh/server.h" #include "libssh/socket.h" #include "libssh/ssh2.h" diff --git a/src/threads.c b/src/threads.c index c654456e..9d70adfb 100644 --- a/src/threads.c +++ b/src/threads.c @@ -27,7 +27,10 @@ * @{ */ +#include "config.h" + #include "libssh/priv.h" +#include "libssh/crypto.h" #include "libssh/threads.h" static int threads_noop (void **lock){ |