Commit 3ba84717 authored by David Woodhouse's avatar David Woodhouse Committed by Rich Salz
Browse files

Finish 02f7114a 



Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
parent 4277cf90

crypto/engine/eng_int.h

+2 −2
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ extern "C" { 
                (unsigned int)(e), (isfunct ? "funct" : "struct"), \

                ((isfunct) ? ((e)->funct_ref - (diff)) : ((e)->struct_ref - (diff))), \

                ((isfunct) ? (e)->funct_ref : (e)->struct_ref), \

                (__FILE__), (__LINE__))

                (OPENSSL_FILE), (OPENSSL_LINE))



# else
@@ -134,7 +134,7 @@ ENGINE *engine_table_select(ENGINE_TABLE **table, int nid); 
# else

ENGINE *engine_table_select_tmp(ENGINE_TABLE **table, int nid, const char *f,

                                int l);

#  define engine_table_select(t,n) engine_table_select_tmp(t,n,__FILE__,__LINE__)

#  define engine_table_select(t,n) engine_table_select_tmp(t,n,OPENSSL_FILE,OPENSSL_LINE)

# endif

typedef void (engine_table_doall_cb) (int nid, STACK_OF(ENGINE) *sk,

                                      ENGINE *def, void *arg);

crypto/lock.c

+3 −3
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ int CRYPTO_get_new_dynlockid(void) 
        return (0);

    }

    pointer->references = 1;

    pointer->data = dynlock_create_callback(__FILE__, __LINE__);

    pointer->data = dynlock_create_callback(OPENSSL_FILE, OPENSSL_LINE);

    if (pointer->data == NULL) {

        OPENSSL_free(pointer);

        CRYPTOerr(CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID, ERR_R_MALLOC_FAILURE);
@@ -281,7 +281,7 @@ int CRYPTO_get_new_dynlockid(void) 
    CRYPTO_w_unlock(CRYPTO_LOCK_DYNLOCK);



    if (i == -1) {

        dynlock_destroy_callback(pointer->data, __FILE__, __LINE__);

        dynlock_destroy_callback(pointer->data, OPENSSL_FILE, OPENSSL_LINE);

        OPENSSL_free(pointer);

    } else

        i += 1;                 /* to avoid 0 */
@@ -319,7 +319,7 @@ void CRYPTO_destroy_dynlockid(int i) 
    CRYPTO_w_unlock(CRYPTO_LOCK_DYNLOCK);



    if (pointer) {

        dynlock_destroy_callback(pointer->data, __FILE__, __LINE__);

        dynlock_destroy_callback(pointer->data, OPENSSL_FILE, OPENSSL_LINE);

        OPENSSL_free(pointer);

    }

}

demos/engines/cluster_labs/hw_cluster_labs_err.h

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ extern "C" { 
static void ERR_load_CL_strings(void);

static void ERR_unload_CL_strings(void);

static void ERR_CL_error(int function, int reason, char *file, int line);

# define CLerr(f,r) ERR_CL_error((f),(r),__FILE__,__LINE__)

# define CLerr(f,r) ERR_CL_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)



/* Error codes for the CL functions. */

demos/engines/ibmca/hw_ibmca_err.h

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ extern "C" { 
static void ERR_load_IBMCA_strings(void);

static void ERR_unload_IBMCA_strings(void);

static void ERR_IBMCA_error(int function, int reason, char *file, int line);

# define IBMCAerr(f,r) ERR_IBMCA_error((f),(r),__FILE__,__LINE__)

# define IBMCAerr(f,r) ERR_IBMCA_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)



/* Error codes for the IBMCA functions. */

demos/engines/rsaref/rsaref_err.h

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ extern "C" { 
static void ERR_load_RSAREF_strings(void);

static void ERR_unload_RSAREF_strings(void);

static void ERR_RSAREF_error(int function, int reason, char *file, int line);

# define RSAREFerr(f,r) ERR_RSAREF_error((f),(r),__FILE__,__LINE__)

# define RSAREFerr(f,r) ERR_RSAREF_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)

/* Error codes for the RSAREF functions. */



/* Function codes. */