Commit 3c853776 authored by Richard J. Moore's avatar Richard J. Moore Committed by Richard Levitte
Browse files

Const the ex data stuff too to fix warnings 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 4a9a0d9b

crypto/ex_data.c

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static void dummy_free(void *parent, void *ptr, CRYPTO_EX_DATA *ad, int idx, 
{

}



static int dummy_dup(CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from,

static int dummy_dup(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,

                     void *from_d, int idx,

                     long argl, void *argp)

{
@@ -250,7 +250,7 @@ int CRYPTO_new_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad) 
 * for each index in the class used by this variable

 */

int CRYPTO_dup_ex_data(int class_index, CRYPTO_EX_DATA *to,

                       CRYPTO_EX_DATA *from)

                       const CRYPTO_EX_DATA *from)

{

    int mx, j, i;

    char *ptr;

doc/crypto/CRYPTO_get_ex_new_index.pod

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ CRYPTO_get_ex_data, CRYPTO_free_ex_data, CRYPTO_new_ex_data 
                           int idx, long argl, void *argp);

 typedef void CRYPTO_EX_free(void *parent, void *ptr, CRYPTO_EX_DATA *ad,

                             int idx, long argl, void *argp);

 typedef int CRYPTO_EX_dup(CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from,

 typedef int CRYPTO_EX_dup(CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,

                           void *from_d, int idx, long argl, void *argp);



 int CRYPTO_new_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad)

include/openssl/crypto.h

+2 −2
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ typedef void CRYPTO_EX_new (void *parent, void *ptr, CRYPTO_EX_DATA *ad, 
                           int idx, long argl, void *argp);

typedef void CRYPTO_EX_free (void *parent, void *ptr, CRYPTO_EX_DATA *ad,

                             int idx, long argl, void *argp);

typedef int CRYPTO_EX_dup (CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from,

typedef int CRYPTO_EX_dup (CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,

                           void *srcp, int idx, long argl, void *argp);

__owur int CRYPTO_get_ex_new_index(int class_index, long argl, void *argp,

                            CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func,
@@ -187,7 +187,7 @@ int CRYPTO_free_ex_index(int class_index, int idx); 
 */

int CRYPTO_new_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad);

int CRYPTO_dup_ex_data(int class_index, CRYPTO_EX_DATA *to,

                       CRYPTO_EX_DATA *from);

                       const CRYPTO_EX_DATA *from);



void CRYPTO_free_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad);