Skip to content

Commit

Permalink
Add old locking constants back
Browse files Browse the repository at this point in the history
Fixes #1260

Reviewed-by: Matt Caswell <matt@openssl.org>

GH: #1266
  • Loading branch information
kroeckx committed Jul 1, 2016
1 parent 453bff2 commit dd850bc
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions include/openssl/crypto.h
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,16 @@ void *CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx);
# define CRYPTO_set_add_lock_callback(func)
# define CRYPTO_get_add_lock_callback() (NULL)

/*
* These defines where used in combination with the old locking callbacks,
* they are not called anymore, but old code that's not called might still
* use them.
*/
# define CRYPTO_LOCK 1
# define CRYPTO_UNLOCK 2
# define CRYPTO_READ 4
# define CRYPTO_WRITE 8

/* This structure is no longer used */
typedef struct crypto_threadid_st {
int dummy;
Expand Down

0 comments on commit dd850bc

Please sign in to comment.