From fb46be034816e5fe9f04fd39da960d34dbf2f52d Mon Sep 17 00:00:00 2001 From: Alessandro Ghedini Date: Fri, 26 Feb 2016 11:51:31 +0000 Subject: Convert CRYPTO_LOCK_BIO to new multi-threading API Reviewed-by: Matt Caswell Reviewed-by: Rich Salz --- include/openssl/bio.h | 2 ++ include/openssl/crypto.h | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/openssl/bio.h b/include/openssl/bio.h index a1b4ced..ae59948 100644 --- a/include/openssl/bio.h +++ b/include/openssl/bio.h @@ -326,6 +326,7 @@ struct bio_st { uint64_t num_read; uint64_t num_write; CRYPTO_EX_DATA ex_data; + CRYPTO_RWLOCK *lock; }; DEFINE_STACK_OF(BIO) @@ -635,6 +636,7 @@ BIO *BIO_new(BIO_METHOD *type); int BIO_set(BIO *a, BIO_METHOD *type); int BIO_free(BIO *a); void BIO_vfree(BIO *a); +int BIO_up_ref(BIO *a); int BIO_read(BIO *b, void *data, int len); int BIO_gets(BIO *bp, char *buf, int size); int BIO_write(BIO *b, const void *data, int len); diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index 53c26b9..a36d717 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -181,7 +181,6 @@ extern "C" { # define CRYPTO_LOCK_RAND 18 # define CRYPTO_LOCK_RAND2 19 # define CRYPTO_LOCK_MALLOC 20 -# define CRYPTO_LOCK_BIO 21 # define CRYPTO_LOCK_READDIR 24 # define CRYPTO_LOCK_RSA_BLINDING 25 # define CRYPTO_LOCK_MALLOC2 27 -- cgit v1.1