diff options
author | Adam Langley <agl@google.com> | 2015-01-31 04:08:37 +0300 |
---|---|---|
committer | Adam Langley <agl@google.com> | 2015-02-02 22:14:15 +0300 |
commit | 2b2d66d4094e5c25789ce68310d86192c377c63b (patch) | |
tree | 0037574fca9fad9755016ccc0f8e4ddb0f978a59 /crypto/pkcs8 | |
parent | efed2210e8e0c6b3db6c63e354f0c9b67673c712 (diff) |
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>
Diffstat (limited to 'crypto/pkcs8')
-rw-r--r-- | crypto/pkcs8/p5_pbe.c | 2 | ||||
-rw-r--r-- | crypto/pkcs8/p5_pbev2.c | 1 | ||||
-rw-r--r-- | crypto/pkcs8/pkcs8.c | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/crypto/pkcs8/p5_pbe.c b/crypto/pkcs8/p5_pbe.c index 7b18b6f8..f30ae79c 100644 --- a/crypto/pkcs8/p5_pbe.c +++ b/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> diff --git a/crypto/pkcs8/p5_pbev2.c b/crypto/pkcs8/p5_pbev2.c index 1af2af22..9eb98480 100644 --- a/crypto/pkcs8/p5_pbev2.c +++ b/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> diff --git a/crypto/pkcs8/pkcs8.c b/crypto/pkcs8/pkcs8.c index 21855790..0b1dfba8 100644 --- a/crypto/pkcs8/pkcs8.c +++ b/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> |