Constification of CRYPTO_get_ex_data() needed for the sake of

RSA_get_ext_data().

diff --git a/crypto/crypto.h b/crypto/crypto.h
index 52ee97b71a2259ea5da9ba4e40fe2297aec38d24..08bb1fc83e81051c09cb7593fee5d6774ee487c1 100644 (file)
--- a/crypto/crypto.h
+++ b/crypto/crypto.h
@@ -281,7 +281,7 @@ unsigned long SSLeay(void);
 int CRYPTO_get_ex_new_index(int idx, STACK_OF(CRYPTO_EX_DATA_FUNCS) **skp, long argl, void *argp,
             CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
 int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, void *val);
 int CRYPTO_get_ex_new_index(int idx, STACK_OF(CRYPTO_EX_DATA_FUNCS) **skp, long argl, void *argp,
             CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);
 int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, void *val);

-void *CRYPTO_get_ex_data(CRYPTO_EX_DATA *ad,int idx);
+void *CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad,int idx);

 int CRYPTO_dup_ex_data(STACK_OF(CRYPTO_EX_DATA_FUNCS) *meth, CRYPTO_EX_DATA *to,
             CRYPTO_EX_DATA *from);
 void CRYPTO_free_ex_data(STACK_OF(CRYPTO_EX_DATA_FUNCS) *meth, void *obj, CRYPTO_EX_DATA *ad);
 int CRYPTO_dup_ex_data(STACK_OF(CRYPTO_EX_DATA_FUNCS) *meth, CRYPTO_EX_DATA *to,
             CRYPTO_EX_DATA *from);
 void CRYPTO_free_ex_data(STACK_OF(CRYPTO_EX_DATA_FUNCS) *meth, void *obj, CRYPTO_EX_DATA *ad);

diff --git a/crypto/ex_data.c b/crypto/ex_data.c
index 739e543d782c57b6c90d2614c60cb16833fb4215..35ea2c298271bb6a4066ec5864428becfc3db8fe 100644 (file)
--- a/crypto/ex_data.c
+++ b/crypto/ex_data.c
@@ -131,7 +131,7 @@ int CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, void *val)
        return(1);
        }
 
        return(1);
        }
 

-void *CRYPTO_get_ex_data(CRYPTO_EX_DATA *ad, int idx)
+void *CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx)

        {
        if (ad->sk == NULL)
                return(0);
        {
        if (ad->sk == NULL)
                return(0);