diff options
| author | Adam Langley <agl@google.com> | 2015-05-11 17:20:37 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2015-05-12 23:06:14 +0000 |
| commit | e9ada863a7b3e81f5d2b1e3bdd2305da902a87f5 (patch) | |
| tree | 6e43e34595ecf887c26c32b86d8ab097fe8cac64 /src/include/openssl/crypto.h | |
| parent | b3106a0cc1493bbe0505c0ec0ce3da4ca90a29ae (diff) | |
| download | external_boringssl-e9ada863a7b3e81f5d2b1e3bdd2305da902a87f5.zip external_boringssl-e9ada863a7b3e81f5d2b1e3bdd2305da902a87f5.tar.gz external_boringssl-e9ada863a7b3e81f5d2b1e3bdd2305da902a87f5.tar.bz2 | |
external/boringssl: bump revision.
This change bumps the BoringSSL revision to the current tip-of-tree.
Change-Id: I91d5bf467e16e8d86cb19a4de873985f524e5faa
Diffstat (limited to 'src/include/openssl/crypto.h')
| -rw-r--r-- | src/include/openssl/crypto.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/include/openssl/crypto.h b/src/include/openssl/crypto.h index e58d5f0..5c974f8 100644 --- a/src/include/openssl/crypto.h +++ b/src/include/openssl/crypto.h @@ -17,8 +17,11 @@ #include <openssl/base.h> +/* Upstream OpenSSL defines |OPENSSL_malloc|, etc., in crypto.h rather than + * mem.h. */ #include <openssl/mem.h> + #if defined(__cplusplus) extern "C" { #endif @@ -32,6 +35,9 @@ extern "C" { * nothing and a static initializer is used instead. */ OPENSSL_EXPORT void CRYPTO_library_init(void); + +/* Deprecated functions. */ + #define OPENSSL_VERSION_TEXT "BoringSSL" #define SSLEAY_VERSION 0 @@ -48,9 +54,9 @@ OPENSSL_EXPORT const char *SSLeay(void); } /* extern C */ #endif -#define CRYPTO_F_CRYPTO_set_ex_data 100 -#define CRYPTO_F_get_class 101 -#define CRYPTO_F_get_new_index 102 +#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 */ |