From f0ddde48262a2f6b71dda3b9718b1f216448060d Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Sat, 28 Oct 2017 14:31:37 +0200
Subject: 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>
---
 src/auth.c                  | 4 ++--
 src/base64.c                | 4 ++--
 src/bignum.c                | 2 ++
 src/buffer.c                | 4 ++--
 src/channels.c              | 4 ++--
 src/client.c                | 4 ++--
 src/connector.c             | 2 ++
 src/error.c                 | 2 ++
 src/external/bcrypt_pbkdf.c | 2 ++
 src/external/fe25519.c      | 2 ++
 src/external/ge25519.c      | 2 ++
 src/external/sc25519.c      | 2 ++
 src/match.c                 | 3 ++-
 src/pki_crypto.c            | 2 ++
 src/pki_ed25519.c           | 2 ++
 src/sftp.c                  | 4 ++--
 src/sftpserver.c            | 4 ++--
 src/socket.c                | 4 ++--
 src/string.c                | 4 ++--
 19 files changed, 38 insertions(+), 19 deletions(-)

(limited to 'src')

diff --git a/src/auth.c b/src/auth.c
index 1baec109..59b6f134 100644
--- a/src/auth.c
+++ b/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>
diff --git a/src/base64.c b/src/base64.c
index 2a162d0b..2bb33ee6 100644
--- a/src/base64.c
+++ b/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"
diff --git a/src/bignum.c b/src/bignum.c
index fd6cf954..346a08a8 100644
--- a/src/bignum.c
+++ b/src/bignum.c
@@ -19,6 +19,8 @@
  * MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 
 #include "libssh/priv.h"
diff --git a/src/buffer.c b/src/buffer.c
index 2da6758a..96250e90 100644
--- a/src/buffer.c
+++ b/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
diff --git a/src/channels.c b/src/channels.c
index d32f0d7a..b74c4f3d 100644
--- a/src/channels.c
+++ b/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>
diff --git a/src/client.c b/src/client.c
index 11a00229..6343dc6a 100644
--- a/src/client.c
+++ b/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>
diff --git a/src/connector.c b/src/connector.c
index 54e85241..6f15ee28 100644
--- a/src/connector.c
+++ b/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"
diff --git a/src/error.c b/src/error.c
index bd755c4f..f1ba945b 100644
--- a/src/error.c
+++ b/src/error.c
@@ -21,6 +21,8 @@
  * MA 02111-1307, USA.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <stdarg.h>
 #include "libssh/priv.h"
diff --git a/src/external/bcrypt_pbkdf.c b/src/external/bcrypt_pbkdf.c
index 55868819..fdf84d0f 100644
--- a/src/external/bcrypt_pbkdf.c
+++ b/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>
diff --git a/src/external/fe25519.c b/src/external/fe25519.c
index db31f651..2b0b673e 100644
--- a/src/external/fe25519.c
+++ b/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)
 
diff --git a/src/external/ge25519.c b/src/external/ge25519.c
index b098cc5e..ffeb1d58 100644
--- a/src/external/ge25519.c
+++ b/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"
diff --git a/src/external/sc25519.c b/src/external/sc25519.c
index c7a02ee6..5f198d5b 100644
--- a/src/external/sc25519.c
+++ b/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"
 
diff --git a/src/match.c b/src/match.c
index 36cc922a..c613a2e6 100644
--- a/src/match.c
+++ b/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"
diff --git a/src/pki_crypto.c b/src/pki_crypto.c
index 70ac6854..53287f30 100644
--- a/src/pki_crypto.c
+++ b/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>
diff --git a/src/pki_ed25519.c b/src/pki_ed25519.c
index 393948ac..8ff398cb 100644
--- a/src/pki_ed25519.c
+++ b/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"
diff --git a/src/sftp.c b/src/sftp.c
index 3b8e0985..3b017baf 100644
--- a/src/sftp.c
+++ b/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>
diff --git a/src/sftpserver.c b/src/sftpserver.c
index 659a688a..820e9668 100644
--- a/src/sftpserver.c
+++ b/src/sftpserver.c
@@ -21,8 +21,8 @@
  * MA 02111-1307, USA.
  */
 
-#include <stdlib.h>
-#include <string.h>
+#include "config.h"
+
 #include <stdio.h>
 
 #ifndef _WIN32
diff --git a/src/socket.c b/src/socket.c
index 76dc55e5..95dedbb2 100644
--- a/src/socket.c
+++ b/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>
diff --git a/src/string.c b/src/string.c
index ba112716..67bce7dc 100644
--- a/src/string.c
+++ b/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>
-- 
cgit v1.2.3