Fix config.h includes

We need stdlib.h and string.h in priv.h for free() and memset().

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>

include/libssh/priv.h

@@ -29,7 +29,8 @@
 #ifndef _LIBSSH_PRIV_H
 #define _LIBSSH_PRIV_H
 
-#include "config.h"
+#include <stdlib.h>
+#include <string.h>
 
 #if !defined(HAVE_STRTOULL)
 # if defined(HAVE___STRTOULL)

src/auth.c

@@ -22,9 +22,9 @@
  * MA 02111-1307, USA.
  */
 
-#include <stdlib.h>
+#include "config.h"
+
 #include <stdio.h>
-#include <string.h>
 
 #ifndef _WIN32
 #include <netinet/in.h>

src/base64.c

@@ -22,9 +22,9 @@
  */
 
 /* just the dirtiest part of code i ever made */
-#include <string.h>
+#include "config.h"
+
 #include <stdio.h>
-#include <stdlib.h>
 
 #include "libssh/priv.h"
 #include "libssh/buffer.h"

src/bignum.c

@@ -19,6 +19,8 @@
  * MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 
 #include "libssh/priv.h"

src/buffer.c

@@ -21,9 +21,9 @@
  * MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <limits.h>
-#include <stdlib.h>
-#include <string.h>
 #include <stdarg.h>
 
 #ifndef _WIN32

src/channels.c

@@ -22,9 +22,9 @@
  * MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <limits.h>
-#include <string.h>
-#include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
 #include <time.h>

src/client.c

@@ -21,9 +21,9 @@
  * MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #ifndef _WIN32
 #include <netinet/in.h>

src/connector.c

@@ -19,6 +19,8 @@
  * MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include "libssh/priv.h"
 #include "libssh/poll.h"
 #include "libssh/callbacks.h"

src/error.c

@@ -21,6 +21,8 @@
  * MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdarg.h>
 #include "libssh/priv.h"

src/external/bcrypt_pbkdf.c

@@ -19,6 +19,8 @@
 
 #ifndef HAVE_BCRYPT_PBKDF
 
+#include "config.h"
+
 #include "libssh/priv.h"
 #include "libssh/wrapper.h"
 #include <stdlib.h>

src/external/fe25519.c

@@ -4,6 +4,8 @@
  * Copied from supercop-20130419/crypto_sign/ed25519/ref/fe25519.c
  */
 
+#include "config.h"
+
 #define WINDOWSIZE 1 /* Should be 1,2, or 4 */
 #define WINDOWMASK ((1<<WINDOWSIZE)-1)
 

src/external/ge25519.c

@@ -6,6 +6,8 @@
  * Copied from supercop-20130419/crypto_sign/ed25519/ref/ge25519.c
  */
 
+#include "config.h"
+
 #include "libssh/fe25519.h"
 #include "libssh/sc25519.h"
 #include "libssh/ge25519.h"

src/external/sc25519.c

@@ -4,6 +4,8 @@
  * Copied from supercop-20130419/crypto_sign/ed25519/ref/sc25519.c
  */
 
+#include "config.h"
+
 #include "libssh/priv.h"
 #include "libssh/sc25519.h"
 

src/match.c

@@ -35,8 +35,9 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
+
 #include <ctype.h>
-#include <string.h>
 #include <sys/types.h>
 
 #include "libssh/priv.h"

src/pki_crypto.c

@@ -25,6 +25,8 @@
 #ifndef _PKI_CRYPTO_H
 #define _PKI_CRYPTO_H
 
+#include "config.h"
+
 #include "libssh/priv.h"
 
 #include <openssl/pem.h>

src/pki_ed25519.c

@@ -21,6 +21,8 @@
  * MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include "libssh/pki.h"
 #include "libssh/pki_priv.h"
 #include "libssh/ed25519.h"

src/sftp.c

@@ -24,12 +24,12 @@
 
 /* This file contains code written by Nick Zitzmann */
 
+#include "config.h"
+
 #include <errno.h>
 #include <ctype.h>
 #include <fcntl.h>
-#include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>

src/sftpserver.c

@@ -21,8 +21,8 @@
  * MA 02111-1307, USA.
  */
 
-#include <stdlib.h>
+#include "config.h"
-#include <string.h>
+
 #include <stdio.h>
 
 #ifndef _WIN32

src/socket.c

@@ -21,9 +21,9 @@
  * MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <errno.h>
-#include <string.h>
-#include <stdlib.h>
 #include <stdio.h>
 #ifdef _WIN32
 #include <winsock2.h>

src/string.c

@@ -21,10 +21,10 @@
  * MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <errno.h>
 #include <limits.h>
-#include <stdlib.h>
-#include <string.h>
 
 #ifndef _WIN32
 #include <netinet/in.h>

tests/client/torture_algorithms.c

@@ -19,6 +19,8 @@
  * MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #define LIBSSH_STATIC
 
 #include "torture.h"

tests/client/torture_auth.c

@@ -19,6 +19,8 @@
  * MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #define LIBSSH_STATIC
 
 #include "torture.h"

tests/client/torture_connect.c

@@ -19,6 +19,8 @@
  * MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #define LIBSSH_STATIC
 
 #include "torture.h"

tests/client/torture_forward.c

@@ -19,6 +19,8 @@
  * MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #define LIBSSH_STATIC
 
 #include "torture.h"

tests/client/torture_knownhosts.c

@@ -19,6 +19,8 @@
  * MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #define LIBSSH_STATIC
 
 #include "torture.h"

tests/client/torture_proxycommand.c

@@ -1,3 +1,5 @@
+#include "config.h"
+
 #define LIBSSH_STATIC
 
 #include "torture.h"

tests/client/torture_request_env.c

@@ -19,6 +19,8 @@
  * MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #define LIBSSH_STATIC
 
 #include "torture.h"

tests/client/torture_session.c

@@ -19,6 +19,8 @@
  * MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #define LIBSSH_STATIC
 
 #include "torture.h"

tests/client/torture_sftp_dir.c

@@ -1,3 +1,5 @@
+#include "config.h"
+
 #define LIBSSH_STATIC
 
 #include "torture.h"

tests/client/torture_sftp_ext.c

@@ -1,5 +1,7 @@
 #define LIBSSH_STATIC
 
+#include "config.h"
+
 #include "torture.h"
 #include "sftp.c"
 

tests/client/torture_sftp_fsync.c

@@ -1,5 +1,7 @@
 #define LIBSSH_STATIC
 
+#include "config.h"
+
 #include "torture.h"
 #include "sftp.c"
 

tests/client/torture_sftp_read.c

@@ -1,5 +1,7 @@
 #define LIBSSH_STATIC
 
+#include "config.h"
+
 #include "torture.h"
 #include "sftp.c"
 

tests/pkd/pkd_hello.c

@@ -3,10 +3,10 @@
  *
  * (c) 2014, 2017 Jon Simons <jon@jonsimons.org>
  */
+#include "config.h"
 
 #include <setjmp.h> // for cmocka
 #include <stdarg.h> // for cmocka
-#include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h> // for cmocka
 #include <cmocka.h>

tests/unittests/torture_buffer.c

@@ -1,3 +1,5 @@
+#include "config.h"
+
 #define LIBSSH_STATIC
 
 #include "torture.h"

tests/unittests/torture_callbacks.c

@@ -1,3 +1,5 @@
+#include "config.h"
+
 #define LIBSSH_STATIC
 
 #include "torture.h"

tests/unittests/torture_channel.c

@@ -1,3 +1,5 @@
+#include "config.h"
+
 #define LIBSSH_STATIC
 #include <libssh/priv.h>
 

tests/unittests/torture_config.c

@@ -1,3 +1,5 @@
+#include "config.h"
+
 #define LIBSSH_STATIC
 
 #include "torture.h"

tests/unittests/torture_crypto.c

@@ -1,3 +1,5 @@
+#include "config.h"
+
 #define LIBSSH_STATIC
 
 #include "torture.h"

tests/unittests/torture_init.c

@@ -1,3 +1,5 @@
+#include "config.h"
+
 #define LIBSSH_STATIC
 
 #include "torture.h"

tests/unittests/torture_isipaddr.c

@@ -1,3 +1,5 @@
+#include "config.h"
+
 #define LIBSSH_STATIC
 
 #include "torture.h"

tests/unittests/torture_keyfiles.c

@@ -1,3 +1,5 @@
+#include "config.h"
+
 #define LIBSSH_STATIC
 
 #include "torture.h"

tests/unittests/torture_list.c

@@ -1,3 +1,5 @@
+#include "config.h"
+
 #define LIBSSH_STATIC
 
 #include "torture.h"

tests/unittests/torture_misc.c

@@ -1,3 +1,4 @@
+#include "config.h"
 
 #include <sys/types.h>
 #ifndef _WIN32

tests/unittests/torture_options.c

@@ -1,3 +1,5 @@
+#include "config.h"
+
 #define LIBSSH_STATIC
 
 #ifndef _WIN32

tests/unittests/torture_pki.c

@@ -1,3 +1,5 @@
+#include "config.h"
+
 #define LIBSSH_STATIC
 
 #include "torture.h"

tests/unittests/torture_pki_ed25519.c

@@ -1,3 +1,5 @@
+#include "config.h"
+
 #define LIBSSH_STATIC
 
 #include "torture.h"

tests/unittests/torture_rand.c

@@ -1,3 +1,5 @@
+#include "config.h"
+
 #define LIBSSH_STATIC
 #include <libssh/priv.h>
 #include <libssh/callbacks.h>