Remove string.h from base.h.

Including string.h in base.h causes any file that includes a BoringSSL
header to include string.h. Generally this wouldn't be a problem,
although string.h might slow down the compile if it wasn't otherwise
needed. However, it also causes problems for ipsec-tools in Android
because OpenSSL didn't have this behaviour.

This change removes string.h from base.h and, instead, adds it to each
.c file that requires it.

Change-Id: I5968e50b0e230fd3adf9b72dd2836e6f52d6fb37
Reviewed-on: https://boringssl-review.googlesource.com/3200
Reviewed-by: David Benjamin <davidben@chromium.org>
Reviewed-by: Adam Langley <agl@google.com>

10 files changed, 12 insertions, 1 deletions

diff --git a/crypto/bio/bio.c b/crypto/bio/bio.c
index 7bd2976f..4d947a6c 100644
--- a/crypto/bio/bio.c
+++ b/crypto/bio/bio.c
@@ -57,8 +57,9 @@
 #include <openssl/bio.h>
 
 #include <errno.h>
-#include <stddef.h>
 #include <limits.h>
+#include <stddef.h>
+#include <string.h>
 
 #include <openssl/err.h>
 #include <openssl/mem.h>
diff --git a/crypto/bio/bio_mem.c b/crypto/bio/bio_mem.c
index 6e90db5c..f3aad6fb 100644
--- a/crypto/bio/bio_mem.c
+++ b/crypto/bio/bio_mem.c
@@ -57,6 +57,7 @@
 #include <openssl/bio.h>
 
 #include <limits.h>
+#include <string.h>
 
 #include <openssl/buf.h>
 #include <openssl/err.h>
diff --git a/crypto/bio/buffer.c b/crypto/bio/buffer.c
index 415a4713..5e423a12 100644
--- a/crypto/bio/buffer.c
+++ b/crypto/bio/buffer.c
@@ -56,6 +56,8 @@
 
 #include <openssl/bio.h>
 
+#include <string.h>
+
 #include <openssl/buf.h>
 #include <openssl/err.h>
 #include <openssl/mem.h>
diff --git a/crypto/bio/connect.c b/crypto/bio/connect.c
index ef1f14d6..66ac3a7b 100644
--- a/crypto/bio/connect.c
+++ b/crypto/bio/connect.c
@@ -59,6 +59,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
+#include <string.h>
 
 #if !defined(OPENSSL_WINDOWS)
 #include <sys/socket.h>
diff --git a/crypto/bio/fd.c b/crypto/bio/fd.c
index c54647c9..6b70eac0 100644
--- a/crypto/bio/fd.c
+++ b/crypto/bio/fd.c
@@ -57,6 +57,7 @@
 #include <openssl/bio.h>
 
 #include <errno.h>
+#include <string.h>
 
 #if !defined(OPENSSL_WINDOWS)
 #include <unistd.h>
diff --git a/crypto/bio/file.c b/crypto/bio/file.c
index e1a67ca8..7f57aad2 100644
--- a/crypto/bio/file.c
+++ b/crypto/bio/file.c
@@ -76,6 +76,7 @@
 
 #include <errno.h>
 #include <stdio.h>
+#include <string.h>
 
 #include <openssl/buf.h>
 #include <openssl/err.h>
diff --git a/crypto/bio/hexdump.c b/crypto/bio/hexdump.c
index 61a2673a..17f55183 100644
--- a/crypto/bio/hexdump.c
+++ b/crypto/bio/hexdump.c
@@ -57,6 +57,7 @@
 #include <openssl/bio.h>
 
 #include <limits.h>
+#include <string.h>
 
 
 /* hexdump_ctx contains the state of a hexdump. */
diff --git a/crypto/bio/pair.c b/crypto/bio/pair.c
index fe6a2750..de2b4cbc 100644
--- a/crypto/bio/pair.c
+++ b/crypto/bio/pair.c
@@ -53,6 +53,7 @@
 #include <openssl/bio.h>
 
 #include <assert.h>
+#include <string.h>
 
 #include <openssl/buf.h>
 #include <openssl/err.h>
diff --git a/crypto/bio/socket.c b/crypto/bio/socket.c
index 671a0468..590447ff 100644
--- a/crypto/bio/socket.c
+++ b/crypto/bio/socket.c
@@ -58,6 +58,7 @@
 #include <openssl/bio.h>
 
 #include <fcntl.h>
+#include <string.h>
 
 #if !defined(OPENSSL_WINDOWS)
 #include <unistd.h>
diff --git a/crypto/bio/socket_helper.c b/crypto/bio/socket_helper.c
index 3fb806e8..52e1606c 100644
--- a/crypto/bio/socket_helper.c
+++ b/crypto/bio/socket_helper.c
@@ -18,6 +18,7 @@
 #include <openssl/err.h>
 
 #include <fcntl.h>
+#include <string.h>
 #include <sys/types.h>
 
 #if !defined(OPENSSL_WINDOWS)