diff options
| author | miod <> | 2014-04-13 15:16:37 +0000 |
|---|---|---|
| committer | miod <> | 2014-04-13 15:16:37 +0000 |
| commit | 25175e3da5ec29dca5edfe32f588ea68b17071c9 (patch) | |
| tree | af609a7374a1d1f305a0380423258452f82a8cd7 /src/lib/libcrypto/mem.c | |
| parent | adb31f466163d59ad933cf9d299ce6c610f1cff3 (diff) | |
| download | openbsd-25175e3da5ec29dca5edfe32f588ea68b17071c9.tar.gz openbsd-25175e3da5ec29dca5edfe32f588ea68b17071c9.tar.bz2 openbsd-25175e3da5ec29dca5edfe32f588ea68b17071c9.zip | |
Import OpenSSL 1.0.1g
Diffstat (limited to 'src/lib/libcrypto/mem.c')
| -rw-r--r-- | src/lib/libcrypto/mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libcrypto/mem.c b/src/lib/libcrypto/mem.c index 21c0011380..1cc62eafd1 100644 --- a/src/lib/libcrypto/mem.c +++ b/src/lib/libcrypto/mem.c | |||
| @@ -121,10 +121,10 @@ static void (*set_debug_options_func)(long) = NULL; | |||
| 121 | static long (*get_debug_options_func)(void) = NULL; | 121 | static long (*get_debug_options_func)(void) = NULL; |
| 122 | #endif | 122 | #endif |
| 123 | 123 | ||
| 124 | |||
| 125 | int CRYPTO_set_mem_functions(void *(*m)(size_t), void *(*r)(void *, size_t), | 124 | int CRYPTO_set_mem_functions(void *(*m)(size_t), void *(*r)(void *, size_t), |
| 126 | void (*f)(void *)) | 125 | void (*f)(void *)) |
| 127 | { | 126 | { |
| 127 | /* Dummy call just to ensure OPENSSL_init() gets linked in */ | ||
| 128 | OPENSSL_init(); | 128 | OPENSSL_init(); |
| 129 | if (!allow_customize) | 129 | if (!allow_customize) |
| 130 | return 0; | 130 | return 0; |
