diff options
| author | Adam Langley <agl@chromium.org> | 2014-07-11 04:07:14 +0400 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2014-07-11 23:04:04 +0400 |
| commit | 0113a4fb60c3b6e9e93a217d5b4d373eb343a8c6 (patch) | |
| tree | 249fa04520e982bfe7c62b9342070a366288e2cc /crypto/chacha | |
| parent | 925fee36e1f6dcad56e60fccca5fa069e09979f7 (diff) | |
Support building with PNaCl.
PNaCl needs OPENSSL_NO_ASM to work and a couple of cases were missing
because it hasn't previously been tested.
Additionally, it defined _BSD_SOURCE and others on the command line,
causing duplicate definition errors when defined in source code.
It's missing readdir_r.
It uses newlib, which appears to use u_short in socket.h without ever
defining it.
Change-Id: Ieccfc7365723d0521f6327eebe9f44a2afc57406
Reviewed-on: https://boringssl-review.googlesource.com/1140
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'crypto/chacha')
| -rw-r--r-- | crypto/chacha/chacha_generic.c | 4 | ||||
| -rw-r--r-- | crypto/chacha/chacha_vec.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/crypto/chacha/chacha_generic.c b/crypto/chacha/chacha_generic.c index b5daed29..40a6f20e 100644 --- a/crypto/chacha/chacha_generic.c +++ b/crypto/chacha/chacha_generic.c @@ -18,7 +18,7 @@ #include <openssl/cpu.h> -#if defined(OPENSSL_WINDOWS) || !defined(OPENSSL_X86_64) && !defined(OPENSSL_X86) +#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. */ static const char sigma[16] = "expand 32-byte k"; @@ -137,4 +137,4 @@ void CRYPTO_chacha_20(uint8_t *out, const uint8_t *in, size_t in_len, } } -#endif /* OPENSSL_WINDOWS || !OPENSSL_X86_64 && !OPENSSL_X86 && !OPENSSL_ARM */ +#endif /* OPENSSL_WINDOWS || !OPENSSL_X86_64 && !OPENSSL_X86 || !__SSE2__ */ diff --git a/crypto/chacha/chacha_vec.c b/crypto/chacha/chacha_vec.c index d06d1dd5..90629a4f 100644 --- a/crypto/chacha/chacha_vec.c +++ b/crypto/chacha/chacha_vec.c @@ -25,7 +25,7 @@ #include <openssl/chacha.h> -#if !defined(OPENSSL_WINDOWS) && (defined(OPENSSL_X86_64) || defined(OPENSSL_X86)) +#if !defined(OPENSSL_WINDOWS) && (defined(OPENSSL_X86_64) || defined(OPENSSL_X86)) && defined(__SSE2__) #define CHACHA_RNDS 20 /* 8 (high speed), 20 (conservative), 12 (middle) */ @@ -326,4 +326,4 @@ void CRYPTO_chacha_20( } } -#endif /* !OPENSSL_WINDOWS && (OPENSSL_X86_64 || OPENSSL_X86) */ +#endif /* !OPENSSL_WINDOWS && (OPENSSL_X86_64 || OPENSSL_X86) && SSE2 */ |