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/base.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/base.h')
| -rw-r--r-- | src/include/openssl/base.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/include/openssl/base.h b/src/include/openssl/base.h index d73f269..b769ad5 100644 --- a/src/include/openssl/base.h +++ b/src/include/openssl/base.h @@ -56,8 +56,8 @@ /* This file should be the first included by all BoringSSL headers. */ +#include <stddef.h> #include <stdint.h> -#include <stdlib.h> #include <sys/types.h> #include <openssl/opensslfeatures.h> @@ -103,6 +103,11 @@ extern "C" { #define OPENSSL_WINDOWS #endif +#if defined(TRUSTY) +#define OPENSSL_TRUSTY +#define OPENSSL_NO_THREADS +#endif + #define OPENSSL_IS_BORINGSSL #define OPENSSL_VERSION_NUMBER 0x10002000 @@ -132,6 +137,9 @@ extern "C" { #endif /* defined(BORINGSSL_SHARED_LIBRARY) */ +/* CRYPTO_THREADID is a dummy value. */ +typedef int CRYPTO_THREADID; + typedef int ASN1_BOOLEAN; typedef int ASN1_NULL; typedef struct ASN1_ITEM_st ASN1_ITEM; @@ -174,7 +182,9 @@ typedef struct bn_mont_ctx_st BN_MONT_CTX; typedef struct buf_mem_st BUF_MEM; typedef struct cbb_st CBB; typedef struct cbs_st CBS; +typedef struct cmac_ctx_st CMAC_CTX; typedef struct conf_st CONF; +typedef struct conf_value_st CONF_VALUE; typedef struct dh_method DH_METHOD; typedef struct dh_st DH; typedef struct dsa_method DSA_METHOD; @@ -198,6 +208,7 @@ typedef struct md5_state_st MD5_CTX; typedef struct pkcs8_priv_key_info_st PKCS8_PRIV_KEY_INFO; typedef struct pkcs12_st PKCS12; typedef struct rand_meth_st RAND_METHOD; +typedef struct rc4_key_st RC4_KEY; typedef struct rsa_meth_st RSA_METHOD; typedef struct rsa_st RSA; typedef struct sha256_state_st SHA256_CTX; |