diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2017-03-19 16:14:33 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-03-20 13:11:31 +0100 |
| commit | b3c31a6572bd7b89f469deb3c78f85f6e303df47 (patch) | |
| tree | 7f6da94a8d2cacb405c58a651e425a1da6c04c99 /include/openssl/crypto.h | |
| parent | e41e5d1e73c878261560e4b122cf309a0ecb42b8 (diff) | |
| download | openssl-b3c31a6572bd7b89f469deb3c78f85f6e303df47.zip openssl-b3c31a6572bd7b89f469deb3c78f85f6e303df47.tar.gz openssl-b3c31a6572bd7b89f469deb3c78f85f6e303df47.tar.bz2 | |
Fix the error handling in CRYPTO_dup_ex_data.
Fix a strict aliasing issue in ui_dup_method_data.
Add test coverage for CRYPTO_dup_ex_data, use OPENSSL_assert.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2988)
Diffstat (limited to 'include/openssl/crypto.h')
| -rw-r--r-- | include/openssl/crypto.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index 3b75dbe..a8b8dc1 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -175,7 +175,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 *srcp, 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, CRYPTO_EX_free *free_func); |