diff options
| author | Kenny Root <kroot@google.com> | 2015-09-25 02:29:14 +0000 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-09-25 02:29:14 +0000 |
| commit | b8494591d1b1a143f3b192d845c238bbf3bc629d (patch) | |
| tree | dd743d9d64af3145fe96b8d5fc2f3427544794bd /src/include/openssl/crypto.h | |
| parent | a04d78d392463df4e69a64360c952ffa5abd22f7 (diff) | |
| download | external_boringssl-b8494591d1b1a143f3b192d845c238bbf3bc629d.zip external_boringssl-b8494591d1b1a143f3b192d845c238bbf3bc629d.tar.gz external_boringssl-b8494591d1b1a143f3b192d845c238bbf3bc629d.tar.bz2 | |
Revert "Revert "external/boringssl: sync with upstream.""
This reverts commit a04d78d392463df4e69a64360c952ffa5abd22f7.
Underlying issue was fixed.
Change-Id: I49685b653d16e728eb38e79e02b2c33ddeefed88
Diffstat (limited to 'src/include/openssl/crypto.h')
| -rw-r--r-- | src/include/openssl/crypto.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/include/openssl/crypto.h b/src/include/openssl/crypto.h index 3af1547..5207a12 100644 --- a/src/include/openssl/crypto.h +++ b/src/include/openssl/crypto.h @@ -21,6 +21,10 @@ * mem.h. */ #include <openssl/mem.h> +/* Upstream OpenSSL defines |CRYPTO_LOCK|, etc., in crypto.h rather than + * thread.h. */ +#include <openssl/thread.h> + #if defined(__cplusplus) extern "C" { @@ -55,9 +59,4 @@ OPENSSL_EXPORT unsigned long SSLeay(void); } /* extern C */ #endif -#define CRYPTO_F_CRYPTO_get_ex_new_index 100 -#define CRYPTO_F_CRYPTO_set_ex_data 101 -#define CRYPTO_F_get_class 102 -#define CRYPTO_F_get_func_pointers 103 - #endif /* OPENSSL_HEADER_CRYPTO_H */ |