Commit f7520011 authored by Alessandro Ghedini's avatar Alessandro Ghedini Committed by Rich Salz
Browse files

Convert CRYPTO_LOCK_EX_DATA to new multi-threading API 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent c74471d2

crypto/ex_data.c

+20 −7
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ 
 */



#include "internal/cryptlib.h"

#include "internal/threads.h"

#include <openssl/lhash.h>



/*
@@ -133,6 +134,16 @@ typedef struct ex_callbacks_st { 


static EX_CALLBACKS ex_data[CRYPTO_EX_INDEX__COUNT];



static CRYPTO_RWLOCK *ex_data_lock;

static CRYPTO_ONCE ex_data_init = CRYPTO_ONCE_STATIC_INIT;



static void do_ex_data_init(void)

{

    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_DISABLE);

    ex_data_lock = CRYPTO_THREAD_lock_new();

    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ENABLE);

}



/*

 * Return the EX_CALLBACKS from the |ex_data| array that corresponds to

 * a given class.  On success, *holds the lock.*
@@ -146,8 +157,10 @@ static EX_CALLBACKS *get_and_lock(int class_index) 
        return NULL;

    }



    CRYPTO_THREAD_run_once(&ex_data_init, do_ex_data_init);



    ip = &ex_data[class_index];

    CRYPTO_w_lock(CRYPTO_LOCK_EX_DATA);

    CRYPTO_THREAD_write_lock(ex_data_lock);

    if (ip->meth == NULL) {

        ip->meth = sk_EX_CALLBACK_new_null();

        /* We push an initial value on the stack because the SSL
@@ -155,7 +168,7 @@ static EX_CALLBACKS *get_and_lock(int class_index) 
        if (ip->meth == NULL

            || !sk_EX_CALLBACK_push(ip->meth, NULL)) {

            CRYPTOerr(CRYPTO_F_GET_AND_LOCK, ERR_R_MALLOC_FAILURE);

            CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA);

            CRYPTO_THREAD_unlock(ex_data_lock);

            return NULL;

        }

    }
@@ -225,7 +238,7 @@ int CRYPTO_free_ex_index(int class_index, int idx) 
    a->free_func = dummy_free;

    toret = 1;

err:

    CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA);

    CRYPTO_THREAD_unlock(ex_data_lock);

    return toret;

}
@@ -262,7 +275,7 @@ int CRYPTO_get_ex_new_index(int class_index, long argl, void *argp, 
    (void)sk_EX_CALLBACK_set(ip->meth, toret, a);



 err:

    CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA);

    CRYPTO_THREAD_unlock(ex_data_lock);

    return toret;

}
@@ -296,7 +309,7 @@ int CRYPTO_new_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad) 
            for (i = 0; i < mx; i++)

                storage[i] = sk_EX_CALLBACK_value(ip->meth, i);

    }

    CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA);

    CRYPTO_THREAD_unlock(ex_data_lock);



    if (mx > 0 && storage == NULL) {

        CRYPTOerr(CRYPTO_F_CRYPTO_NEW_EX_DATA, ERR_R_MALLOC_FAILURE);
@@ -346,7 +359,7 @@ int CRYPTO_dup_ex_data(int class_index, CRYPTO_EX_DATA *to, 
            for (i = 0; i < mx; i++)

                storage[i] = sk_EX_CALLBACK_value(ip->meth, i);

    }

    CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA);

    CRYPTO_THREAD_unlock(ex_data_lock);



    if (mx > 0 && storage == NULL) {

        CRYPTOerr(CRYPTO_F_CRYPTO_DUP_EX_DATA, ERR_R_MALLOC_FAILURE);
@@ -391,7 +404,7 @@ void CRYPTO_free_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad) 
            for (i = 0; i < mx; i++)

                storage[i] = sk_EX_CALLBACK_value(ip->meth, i);

    }

    CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA);

    CRYPTO_THREAD_unlock(ex_data_lock);



    if (mx > 0 && storage == NULL) {

        CRYPTOerr(CRYPTO_F_CRYPTO_FREE_EX_DATA, ERR_R_MALLOC_FAILURE);

include/openssl/crypto.h

+0 −1
Original line number Diff line number Diff line
@@ -166,7 +166,6 @@ extern "C" { 
 */



# define CRYPTO_LOCK_ERR                 1

# define CRYPTO_LOCK_EX_DATA             2

# define CRYPTO_LOCK_X509                3

# define CRYPTO_LOCK_X509_INFO           4

# define CRYPTO_LOCK_X509_PKEY           5