From 3c8537765cdee4d4a81b11246dd7d1b8a09f0126 Mon Sep 17 00:00:00 2001 From: "Richard J. Moore" Date: Sun, 31 Jul 2016 11:04:48 +0100 Subject: [PATCH] Const the ex data stuff too to fix warnings Reviewed-by: Rich Salz Reviewed-by: Richard Levitte --- crypto/ex_data.c | 4 ++-- doc/crypto/CRYPTO_get_ex_new_index.pod | 2 +- include/openssl/crypto.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crypto/ex_data.c b/crypto/ex_data.c index d9807d5859..986ef70bc4 100644 --- a/crypto/ex_data.c +++ b/crypto/ex_data.c @@ -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; diff --git a/doc/crypto/CRYPTO_get_ex_new_index.pod b/doc/crypto/CRYPTO_get_ex_new_index.pod index 17110f76d2..98085f525b 100644 --- a/doc/crypto/CRYPTO_get_ex_new_index.pod +++ b/doc/crypto/CRYPTO_get_ex_new_index.pod @@ -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) diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index 18b9c1b7ba..bac9d0f752 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -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); -- 2.25.1