priv: Remove crypto.h and add correct includes to src files.

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);

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

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

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,

src/auth.c

@@ -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"

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"

src/getpass.c

@@ -23,6 +23,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include <stdlib.h>
 
 #include <libssh/priv.h>
 

src/gzip.c

@@ -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) {

src/pcap.c

@@ -32,6 +32,7 @@
 #include <sys/socket.h>
 #endif
 #include <errno.h>
+#include <stdlib.h>
 
 #include "libssh/libssh.h"
 #include "libssh/pcap.h"

src/poll.c

@@ -28,6 +28,7 @@
 #include "config.h"
 
 #include <errno.h>
+#include <stdlib.h>
 
 #include "libssh/priv.h"
 #include "libssh/libssh.h"

src/scp.c

@@ -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"

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"

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){