diff options
| author | Björn Gustavsson <[email protected]> | 2016-12-09 10:12:09 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-12-09 10:13:57 +0100 |
| commit | 53aa4605b8c23ec1cb7d5a79625db00ebdd63423 (patch) | |
| tree | 44ad08ff6186a5b2a849ba1de3dea7936c060949 /lib/crypto/c_src/crypto_callback.h | |
| parent | 25d76cf3def28eecfdb31bce42345c375c629600 (diff) | |
| parent | 458c012e18eda87803ef356221d68955f4b8012d (diff) | |
| download | otp-53aa4605b8c23ec1cb7d5a79625db00ebdd63423.tar.gz otp-53aa4605b8c23ec1cb7d5a79625db00ebdd63423.tar.bz2 otp-53aa4605b8c23ec1cb7d5a79625db00ebdd63423.zip | |
Merge branch 'bjorn/crypto/support-openssl-1.1'
* bjorn/crypto/support-openssl-1.1:
Support OpenSSL 1.1.0
crypto.c: Disable broken code for ChaCha and Poly1305
configure.in: Fix configure test for usable OpenSSL
configure.in: Fix test for SSL with Kerberos
OTP-13900
Diffstat (limited to 'lib/crypto/c_src/crypto_callback.h')
| -rw-r--r-- | lib/crypto/c_src/crypto_callback.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/crypto/c_src/crypto_callback.h b/lib/crypto/c_src/crypto_callback.h index 894d86cfd9..2641cc0c8b 100644 --- a/lib/crypto/c_src/crypto_callback.h +++ b/lib/crypto/c_src/crypto_callback.h @@ -18,13 +18,20 @@ * %CopyrightEnd% */ +#include <openssl/crypto.h> +#if OPENSSL_VERSION_NUMBER < 0x10100000L +# define CCB_FILE_LINE_ARGS +#else +# define CCB_FILE_LINE_ARGS , const char *file, int line +#endif + struct crypto_callbacks { size_t sizeof_me; - void* (*crypto_alloc)(size_t size); - void* (*crypto_realloc)(void* ptr, size_t size); - void (*crypto_free)(void* ptr); + void* (*crypto_alloc)(size_t size CCB_FILE_LINE_ARGS); + void* (*crypto_realloc)(void* ptr, size_t size CCB_FILE_LINE_ARGS); + void (*crypto_free)(void* ptr CCB_FILE_LINE_ARGS); /* openssl callbacks */ #ifdef OPENSSL_THREADS |