summaryrefslogtreecommitdiffstats
path: root/src/crypto/internal.h
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2015-09-25 02:29:14 +0000
committerKenny Root <kroot@google.com>2015-09-25 02:29:14 +0000
commitb8494591d1b1a143f3b192d845c238bbf3bc629d (patch)
treedd743d9d64af3145fe96b8d5fc2f3427544794bd /src/crypto/internal.h
parenta04d78d392463df4e69a64360c952ffa5abd22f7 (diff)
downloadexternal_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/crypto/internal.h')
-rw-r--r--src/crypto/internal.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/crypto/internal.h b/src/crypto/internal.h
index 59eddd0..713659d 100644
--- a/src/crypto/internal.h
+++ b/src/crypto/internal.h
@@ -452,6 +452,7 @@ OPENSSL_EXPORT void CRYPTO_STATIC_MUTEX_unlock(
typedef enum {
OPENSSL_THREAD_LOCAL_ERR = 0,
OPENSSL_THREAD_LOCAL_RAND,
+ OPENSSL_THREAD_LOCAL_URANDOM_BUF,
OPENSSL_THREAD_LOCAL_TEST,
NUM_OPENSSL_THREAD_LOCALS,
} thread_local_data_t;
@@ -493,9 +494,14 @@ typedef struct crypto_ex_data_func_st CRYPTO_EX_DATA_FUNCS;
typedef struct {
struct CRYPTO_STATIC_MUTEX lock;
STACK_OF(CRYPTO_EX_DATA_FUNCS) *meth;
+ /* num_reserved is one if the ex_data index zero is reserved for legacy
+ * |TYPE_get_app_data| functions. */
+ uint8_t num_reserved;
} CRYPTO_EX_DATA_CLASS;
-#define CRYPTO_EX_DATA_CLASS_INIT {CRYPTO_STATIC_MUTEX_INIT, NULL}
+#define CRYPTO_EX_DATA_CLASS_INIT {CRYPTO_STATIC_MUTEX_INIT, NULL, 0}
+#define CRYPTO_EX_DATA_CLASS_INIT_WITH_APP_DATA \
+ {CRYPTO_STATIC_MUTEX_INIT, NULL, 1}
/* CRYPTO_get_ex_new_index allocates a new index for |ex_data_class| and writes
* it to |*out_index|. Each class of object should provide a wrapper function