summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorBernd Edlinger <bernd.edlinger@hotmail.de>2017-03-20 17:29:28 +0100
committerBernd Edlinger <bernd.edlinger@hotmail.de>2020-05-23 15:31:14 +0200
commit712e8debb5b2238450b303acb5f24298382c63a5 (patch)
treefbcbc73a1b34465cee2c4ab6199c3ae2a1ad9384 /include
parent2de64666a07cccf8477e6483de62ae31f463df64 (diff)
Fix the parameter types of the CRYPTO_EX_dup function type.
This fixes a strict aliasing issue in ui_dup_method_data. The parameter type of CRYPTO_EX_dup's from_d parameter is in fact void **, since it points to a pointer. This function is rarely used, therefore fix the param type although that may be considered an API breaking change. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2986)
Diffstat (limited to 'include')
-rw-r--r--include/openssl/crypto.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h
index 3cca316cd4..58965de0e8 100644
--- a/include/openssl/crypto.h
+++ b/include/openssl/crypto.h
@@ -201,7 +201,7 @@ typedef void CRYPTO_EX_new (void *parent, void *ptr, CRYPTO_EX_DATA *ad,
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, const CRYPTO_EX_DATA *from,
- void *from_d, int idx, long argl, void *argp);
+ void **from_d, 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,