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>

crypto/asn1/a_bitstr.c

@@ -56,9 +56,12 @@
 
 #include <openssl/asn1.h>
 
+#include <string.h>
+
 #include <openssl/err.h>
 #include <openssl/mem.h>
 
+
 int ASN1_BIT_STRING_set(ASN1_BIT_STRING *x, unsigned char *d, int len)
 { return M_ASN1_BIT_STRING_set(x, d, len); }
 

crypto/asn1/a_bytes.c

@@ -56,6 +56,8 @@
 
 #include <openssl/asn1.h>
 
+#include <string.h>
+
 #include <openssl/buf.h>
 #include <openssl/err.h>
 #include <openssl/mem.h>

crypto/asn1/a_enum.c

@@ -56,6 +56,8 @@
 
 #include <openssl/asn1.h>
 
+#include <string.h>
+
 #include <openssl/err.h>
 #include <openssl/mem.h>
 

crypto/asn1/a_gentm.c

@@ -56,6 +56,8 @@
 
 #include <openssl/asn1.h>
 
+#include <string.h>
+
 #include <openssl/err.h>
 #include <openssl/mem.h>
 #include <openssl/time_support.h>

crypto/asn1/a_int.c

@@ -56,6 +56,8 @@
 
 #include <openssl/asn1.h>
 
+#include <string.h>
+
 #include <openssl/err.h>
 #include <openssl/mem.h>
 

crypto/asn1/a_mbstr.c

@@ -56,6 +56,8 @@
 
 #include <openssl/asn1.h>
 
+#include <string.h>
+
 #include <openssl/err.h>
 #include <openssl/mem.h>
 

crypto/asn1/a_object.c

@@ -57,6 +57,7 @@
 #include <openssl/asn1.h>
 
 #include <limits.h>
+#include <string.h>
 
 #include <openssl/err.h>
 #include <openssl/mem.h>

crypto/asn1/a_strnid.c

@@ -57,6 +57,7 @@
 #include <openssl/asn1.h>
 
 #include <stdlib.h>  /* For bsearch */
+#include <string.h>
 
 #include <openssl/err.h>
 #include <openssl/mem.h>

crypto/asn1/a_time.c

@@ -56,6 +56,8 @@
 
 #include <openssl/asn1.h>
 
+#include <string.h>
+
 #include <openssl/asn1t.h>
 #include <openssl/buf.h>
 #include <openssl/err.h>

crypto/asn1/a_utctm.c

@@ -56,6 +56,8 @@
 
 #include <openssl/asn1.h>
 
+#include <string.h>
+
 #include <openssl/err.h>
 #include <openssl/mem.h>
 #include <openssl/time_support.h>

crypto/asn1/asn1_lib.c

@@ -57,6 +57,7 @@
 #include <openssl/asn1.h>
 
 #include <limits.h>
+#include <string.h>
 
 #include <openssl/asn1_mac.h>
 #include <openssl/err.h>

crypto/asn1/bio_asn1.c

@@ -57,6 +57,7 @@
 #include <openssl/asn1.h>
 
 #include <assert.h>
+#include <string.h>
 
 #include <openssl/bio.h>
 #include <openssl/mem.h>

crypto/asn1/t_bitst.c

@@ -56,6 +56,8 @@
 
 #include <openssl/asn1.h>
 
+#include <string.h>
+
 #include <openssl/mem.h>
 
 

crypto/asn1/tasn_dec.c

@@ -56,6 +56,8 @@
 
 #include <openssl/asn1.h>
 
+#include <string.h>
+
 #include <openssl/asn1t.h>
 #include <openssl/buf.h>
 #include <openssl/err.h>

crypto/asn1/tasn_enc.c

@@ -56,6 +56,8 @@
 
 #include <openssl/asn1.h>
 
+#include <string.h>
+
 #include <openssl/asn1t.h>
 #include <openssl/mem.h>
 

crypto/asn1/tasn_new.c

@@ -56,6 +56,8 @@
 
 #include <openssl/asn1.h>
 
+#include <string.h>
+
 #include <openssl/asn1t.h>
 #include <openssl/err.h>
 #include <openssl/mem.h>

crypto/asn1/tasn_utl.c

@@ -56,6 +56,8 @@
 
 #include <openssl/asn1.h>
 
+#include <string.h>
+
 #include <openssl/asn1t.h>
 #include <openssl/mem.h>
 #include <openssl/obj.h>

crypto/asn1/x_long.c

@@ -56,6 +56,8 @@
 
 #include <openssl/asn1.h>
 
+#include <string.h>
+
 #include <openssl/asn1t.h>
 #include <openssl/bn.h>
 #include <openssl/err.h>

crypto/base64/base64.c

@@ -58,6 +58,7 @@
 
 #include <assert.h>
 #include <limits.h>
+#include <string.h>
 
 
 static const unsigned char data_bin2ascii[65] =

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>

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>

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>

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>

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>

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>

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. */

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>

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>

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)

crypto/bn/bn.c

@@ -57,6 +57,8 @@
 #include <openssl/bn.h>
 
 #include <limits.h>
+#include <string.h>
+
 #include <openssl/err.h>
 #include <openssl/mem.h>
 

crypto/bn/bn_test.c

@@ -68,6 +68,7 @@
  * Laboratories. */
 
 #include <stdio.h>
+#include <string.h>
 
 #include <openssl/bio.h>
 #include <openssl/bn.h>
@@ -77,6 +78,7 @@
 
 #include "internal.h"
 
+
 static const int num0 = 100; /* number of tests */
 static const int num1 = 50;  /* additional tests for some functions */
 static const int num2 = 5;   /* number of tests for slow functions */

crypto/bn/convert.c

@@ -58,6 +58,7 @@
 
 #include <ctype.h>
 #include <stdio.h>
+#include <string.h>
 
 #include <openssl/bio.h>
 #include <openssl/err.h>

crypto/bn/ctx.c

@@ -54,6 +54,8 @@
 
 #include <openssl/bn.h>
 
+#include <string.h>
+
 #include <openssl/err.h>
 #include <openssl/mem.h>
 

crypto/bn/exponentiation.c

@@ -109,6 +109,7 @@
 #include <openssl/bn.h>
 
 #include <assert.h>
+#include <string.h>
 
 #include <openssl/cpu.h>
 #include <openssl/err.h>

crypto/bn/montgomery.c

@@ -108,6 +108,8 @@
 
 #include <openssl/bn.h>
 
+#include <string.h>
+
 #include <openssl/mem.h>
 #include <openssl/thread.h>
 

crypto/bn/mul.c

@@ -57,6 +57,7 @@
 #include <openssl/bn.h>
 
 #include <assert.h>
+#include <string.h>
 
 #include "internal.h"
 

crypto/bn/random.c

@@ -108,6 +108,8 @@
 
 #include <openssl/bn.h>
 
+#include <string.h>
+
 #include <openssl/err.h>
 #include <openssl/mem.h>
 #include <openssl/rand.h>

crypto/bn/shift.c

@@ -56,8 +56,11 @@
 
 #include <openssl/bn.h>
 
+#include <string.h>
+
 #include "internal.h"
 
+
 int BN_lshift(BIGNUM *r, const BIGNUM *a, int n) {
   int i, nw, lb, rb;
   BN_ULONG *t, *f;

crypto/buf/buf.c

@@ -56,6 +56,8 @@
 
 #include <openssl/buf.h>
 
+#include <string.h>
+
 #include <openssl/mem.h>
 #include <openssl/err.h>
 

crypto/bytestring/ber.c

@@ -14,6 +14,8 @@
 
 #include <openssl/bytestring.h>
 
+#include <string.h>
+
 #include "internal.h"
 
 

crypto/bytestring/bytestring_test.c

@@ -14,6 +14,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <openssl/crypto.h>
 #include <openssl/bytestring.h>

crypto/bytestring/cbb.c

@@ -15,6 +15,7 @@
 #include <openssl/bytestring.h>
 
 #include <assert.h>
+#include <string.h>
 
 #include <openssl/mem.h>
 

crypto/chacha/chacha_generic.c

@@ -16,8 +16,11 @@
 
 #include <openssl/chacha.h>
 
+#include <string.h>
+
 #include <openssl/cpu.h>
 
+
 #if defined(OPENSSL_WINDOWS) || (!defined(OPENSSL_X86_64) && !defined(OPENSSL_X86)) || !defined(__SSE2__)
 
 /* sigma contains the ChaCha constants, which happen to be an ASCII string. */

crypto/cipher/cipher_test.c

@@ -55,6 +55,7 @@
  * [including the GNU Public Licence.] */
 
 #include <stdio.h>
+#include <string.h>
 
 #include <openssl/bio.h>
 #include <openssl/cipher.h>

crypto/cipher/e_aes.c

@@ -46,6 +46,8 @@
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  * ==================================================================== */
 
+#include <string.h>
+
 #include <openssl/aead.h>
 #include <openssl/aes.h>
 #include <openssl/cipher.h>

crypto/cipher/e_chacha20poly1305.c

@@ -14,6 +14,8 @@
 
 #include <openssl/aead.h>
 
+#include <string.h>
+
 #include <openssl/chacha.h>
 #include <openssl/cipher.h>
 #include <openssl/err.h>

crypto/cipher/e_null.c

@@ -56,6 +56,8 @@
 
 #include <openssl/cipher.h>
 
+#include <string.h>
+
 #include <openssl/obj.h>
 
 #include "internal.h"

crypto/cipher/e_rc4.c

@@ -57,6 +57,7 @@
 #include <openssl/aead.h>
 
 #include <assert.h>
+#include <string.h>
 
 #include <openssl/cipher.h>
 #include <openssl/cpu.h>

crypto/cipher/tls_cbc.c

@@ -51,6 +51,7 @@
  * Hudson (tjh@cryptsoft.com). */
 
 #include <assert.h>
+#include <string.h>
 
 #include <openssl/digest.h>
 #include <openssl/obj.h>

crypto/cpu-intel.c

@@ -63,8 +63,9 @@
 
 #if !defined(OPENSSL_NO_ASM) && (defined(OPENSSL_X86) || defined(OPENSSL_X86_64))
 
-#include <stdio.h>
 #include <inttypes.h>
+#include <stdio.h>
+#include <string.h>
 
 /* OPENSSL_ia32_cpuid is defined in cpu-x86_64-asm.pl. */
 extern uint64_t OPENSSL_ia32_cpuid(uint32_t*);

crypto/dh/dh.c

@@ -56,6 +56,8 @@
 
 #include <openssl/dh.h>
 
+#include <string.h>
+
 #include <openssl/bn.h>
 #include <openssl/buf.h>
 #include <openssl/err.h>

crypto/dh/dh_test.c

@@ -57,6 +57,7 @@
 #include <openssl/dh.h>
 
 #include <stdio.h>
+#include <string.h>
 
 #include <openssl/bio.h>
 #include <openssl/bn.h>

crypto/digest/md32_common.h

@@ -51,6 +51,8 @@
 
 #include <openssl/base.h>
 
+#include <string.h>
+
 
 #if defined(__cplusplus)
 extern "C" {

crypto/directory_posix.c

@@ -35,6 +35,7 @@
 
 #include <dirent.h>
 #include <errno.h>
+#include <string.h>
 
 #if defined(OPENSSL_PNACL)
 /* pnacl doesn't include readdir_r! So we do the best we can. */

crypto/directory_win.c

@@ -33,8 +33,9 @@
 #pragma warning(push, 3)
 #include <windows.h>
 #pragma warning(pop)
-#include <tchar.h>
 #include <errno.h>
+#include <string.h>
+#include <tchar.h>
 
 #ifndef NAME_MAX
 #define NAME_MAX 255

crypto/dsa/dsa.c

@@ -59,6 +59,8 @@
 
 #include <openssl/dsa.h>
 
+#include <string.h>
+
 #include <openssl/asn1.h>
 #include <openssl/dh.h>
 #include <openssl/engine.h>
@@ -68,6 +70,7 @@
 
 #include "internal.h"
 
+
 extern const DSA_METHOD DSA_default_method;
 
 DSA *DSA_new(void) { return DSA_new_method(NULL); }

crypto/dsa/dsa_asn1.c

@@ -54,6 +54,8 @@
 
 #include <openssl/dsa.h>
 
+#include <string.h>
+
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
 #include <openssl/err.h>

crypto/dsa/dsa_impl.c

@@ -59,6 +59,8 @@
 
 #include <openssl/dsa.h>
 
+#include <string.h>
+
 #include <openssl/bn.h>
 #include <openssl/digest.h>
 #include <openssl/err.h>

crypto/dsa/dsa_test.c

@@ -59,6 +59,8 @@
 
 #include <openssl/dsa.h>
 
+#include <string.h>
+
 #include <openssl/bio.h>
 #include <openssl/bn.h>
 #include <openssl/crypto.h>

crypto/ec/ec.c

@@ -67,6 +67,8 @@
 
 #include <openssl/ec.h>
 
+#include <string.h>
+
 #include <openssl/bn.h>
 #include <openssl/err.h>
 #include <openssl/mem.h>

crypto/ec/ec_asn1.c

@@ -53,6 +53,8 @@
 
 #include <openssl/ec.h>
 
+#include <string.h>
+
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
 #include <openssl/bn.h>

crypto/ec/ec_key.c

@@ -67,6 +67,8 @@
 
 #include <openssl/ec_key.h>
 
+#include <string.h>
+
 #include <openssl/ec.h>
 #include <openssl/engine.h>
 #include <openssl/err.h>

crypto/ec/simple.c

@@ -67,6 +67,8 @@
 
 #include <openssl/ec.h>
 
+#include <string.h>
+
 #include <openssl/bn.h>
 #include <openssl/err.h>
 #include <openssl/mem.h>

crypto/ec/wnaf.c

@@ -67,6 +67,8 @@
 
 #include <openssl/ec.h>
 
+#include <string.h>
+
 #include <openssl/bn.h>
 #include <openssl/err.h>
 #include <openssl/mem.h>

crypto/ecdh/ecdh.c

@@ -66,6 +66,8 @@
 
 #include <openssl/ecdh.h>
 
+#include <string.h>
+
 #include <openssl/bn.h>
 #include <openssl/digest.h>
 #include <openssl/err.h>

crypto/ecdsa/ecdsa.c

@@ -52,6 +52,8 @@
 
 #include <openssl/ecdsa.h>
 
+#include <string.h>
+
 #include <openssl/bn.h>
 #include <openssl/err.h>
 #include <openssl/mem.h>

crypto/engine/engine.c

@@ -14,6 +14,8 @@
 
 #include <openssl/engine.h>
 
+#include <string.h>
+
 #include <openssl/dh.h>
 #include <openssl/dsa.h>
 #include <openssl/ec_key.h>

crypto/err/err.c

@@ -113,6 +113,7 @@
 #include <inttypes.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <string.h>
 
 #if defined(OPENSSL_WINDOWS)
 #pragma warning(push, 3)

crypto/err/err_impl.c

@@ -109,6 +109,7 @@
 #include <openssl/err.h>
 
 #include <assert.h>
+#include <string.h>
 
 #include <openssl/lhash.h>
 #include <openssl/mem.h>

crypto/err/err_test.c

@@ -13,6 +13,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
 #include <stdio.h>
+#include <string.h>
 
 #include <openssl/crypto.h>
 #include <openssl/err.h>

crypto/evp/evp.c

@@ -57,6 +57,7 @@
 #include <openssl/evp.h>
 
 #include <assert.h>
+#include <string.h>
 
 #include <openssl/bio.h>
 #include <openssl/dh.h>

crypto/evp/evp_ctx.c

@@ -57,6 +57,7 @@
 #include <openssl/evp.h>
 
 #include <stdio.h>
+#include <string.h>
 
 #include <openssl/err.h>
 #include <openssl/mem.h>

crypto/evp/p_ec.c

@@ -55,6 +55,8 @@
 
 #include <openssl/evp.h>
 
+#include <string.h>
+
 #include <openssl/asn1.h>
 #include <openssl/bn.h>
 #include <openssl/buf.h>

crypto/evp/p_hmac.c

@@ -55,6 +55,8 @@
 
 #include <openssl/evp.h>
 
+#include <string.h>
+
 #include <openssl/asn1.h>
 #include <openssl/err.h>
 #include <openssl/hmac.h>

crypto/evp/p_rsa.c

@@ -55,6 +55,8 @@
 
 #include <openssl/evp.h>
 
+#include <string.h>
+
 #include <openssl/bn.h>
 #include <openssl/buf.h>
 #include <openssl/digest.h>

crypto/evp/pbkdf.c

@@ -55,6 +55,8 @@
 
 #include <openssl/evp.h>
 
+#include <string.h>
+
 #include <openssl/hmac.h>
 
 

crypto/evp/pbkdf_test.c

@@ -13,6 +13,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
 #include <stdio.h>
+#include <string.h>
 
 #include <openssl/bio.h>
 #include <openssl/crypto.h>

crypto/hkdf/hkdf.c

@@ -15,6 +15,7 @@
 #include <openssl/hkdf.h>
 
 #include <assert.h>
+#include <string.h>
 
 #include <openssl/err.h>
 #include <openssl/hmac.h>

crypto/hkdf/hkdf_test.c

@@ -13,6 +13,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
 
 #include <stdio.h>
+#include <string.h>
 
 #include <openssl/bio.h>
 #include <openssl/crypto.h>

crypto/hmac/hmac.c

@@ -57,6 +57,7 @@
 #include <openssl/hmac.h>
 
 #include <assert.h>
+#include <string.h>
 
 #include <openssl/mem.h>
 

crypto/hmac/hmac_test.c

@@ -56,6 +56,7 @@
 
 #include <assert.h>
 #include <stdio.h>
+#include <string.h>
 
 #include <openssl/crypto.h>
 #include <openssl/digest.h>

crypto/lhash/lhash.c

@@ -57,6 +57,7 @@
 
 #include <assert.h>
 #include <limits.h>
+#include <string.h>
 
 #include <openssl/mem.h>
 

crypto/md4/md4.c

@@ -56,6 +56,8 @@
 
 #include <openssl/md4.h>
 
+#include <string.h>
+
 
 /* Implemented from RFC1186 The MD4 Message-Digest Algorithm. */
 

crypto/modes/cbc.c

@@ -48,6 +48,7 @@
 #include <openssl/modes.h>
 
 #include <assert.h>
+#include <string.h>
 
 #include "internal.h"
 

crypto/modes/cfb.c

@@ -49,6 +49,7 @@
 #include <openssl/modes.h>
 
 #include <assert.h>
+#include <string.h>
 
 #include "internal.h"
 

crypto/modes/ctr.c

@@ -48,6 +48,7 @@
 #include <openssl/modes.h>
 
 #include <assert.h>
+#include <string.h>
 
 #include "internal.h"
 

crypto/modes/gcm.c

@@ -49,6 +49,7 @@
 #include <openssl/modes.h>
 
 #include <assert.h>
+#include <string.h>
 
 #include <openssl/mem.h>
 #include <openssl/cpu.h>

crypto/modes/gcm_test.c

@@ -47,6 +47,7 @@
  * ==================================================================== */
 
 #include <stdio.h>
+#include <string.h>
 
 #include <openssl/aes.h>
 #include <openssl/crypto.h>

crypto/obj/obj.c

@@ -57,6 +57,7 @@
 #include <openssl/obj.h>
 
 #include <limits.h>
+#include <string.h>
 
 #include <openssl/asn1.h>
 #include <openssl/buf.h>

crypto/pem/pem_info.c

@@ -58,8 +58,9 @@
 
 #include <openssl/pem.h>
 
-#include <stdio.h>
 #include <assert.h>
+#include <stdio.h>
+#include <string.h>
 
 #include <openssl/buf.h>
 #include <openssl/dsa.h>

crypto/pem/pem_lib.c

@@ -58,6 +58,7 @@
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
+#include <string.h>
 
 #include <openssl/base64.h>
 #include <openssl/buf.h>

crypto/pem/pem_pkey.c

@@ -57,6 +57,7 @@
 #include <openssl/pem.h>
 
 #include <stdio.h>
+#include <string.h>
 
 #include <openssl/buf.h>
 #include <openssl/dh.h>

crypto/pkcs8/p5_pbe.c

@@ -53,6 +53,8 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
+#include <string.h>
+
 #include <openssl/asn1t.h>
 #include <openssl/err.h>
 #include <openssl/pkcs8.h>

crypto/pkcs8/p5_pbev2.c

@@ -53,6 +53,7 @@
  * (eay@cryptsoft.com).  This product includes software written by Tim
  * Hudson (tjh@cryptsoft.com). */
 
+#include <string.h>
 
 #include <openssl/asn1t.h>
 #include <openssl/cipher.h>

crypto/pkcs8/pkcs8.c

@@ -57,6 +57,7 @@
 
 #include <assert.h>
 #include <limits.h>
+#include <string.h>
 
 #include <openssl/asn1.h>
 #include <openssl/bn.h>

crypto/poly1305/poly1305_arm.c

@@ -19,6 +19,9 @@
 
 #if defined(OPENSSL_ARM) && !defined(OPENSSL_NO_ASM)
 
+#include <string.h>
+
+
 typedef struct {
   uint32_t v[12]; /* for alignment; only using 10 */
 } fe1305x2;

crypto/rand/windows.c

@@ -32,6 +32,7 @@
 
 #pragma warning(pop)
 
+
 void RAND_cleanup(void) {
 }
 

crypto/rsa/blinding.c

@@ -108,12 +108,15 @@
 
 #include <openssl/rsa.h>
 
+#include <string.h>
+
 #include <openssl/bn.h>
 #include <openssl/mem.h>
 #include <openssl/err.h>
 
 #include "internal.h"
 
+
 #define BN_BLINDING_COUNTER 32
 
 struct bn_blinding_st {

crypto/rsa/padding.c

@@ -56,6 +56,7 @@
 #include <openssl/rsa.h>
 
 #include <assert.h>
+#include <string.h>
 
 #include <openssl/digest.h>
 #include <openssl/err.h>

crypto/rsa/rsa.c

@@ -56,6 +56,8 @@
 
 #include <openssl/rsa.h>
 
+#include <string.h>
+
 #include <openssl/bn.h>
 #include <openssl/engine.h>
 #include <openssl/err.h>