diff options
| author | Alberto Gonzalez Iniesta <agi@inittab.org> | 2013-06-03 18:47:54 +0200 |
|---|---|---|
| committer | Alberto Gonzalez Iniesta <agi@inittab.org> | 2013-06-03 18:47:54 +0200 |
| commit | c7f5b684601f45769f7e3252a407be748d1fc2ca (patch) | |
| tree | 940368aafbfb471169a19bb16a2275be179d4c5a /src/openvpn/crypto_openssl.c | |
| parent | 31feacd9451b798cb0b29b42298eddaba3f697ee (diff) | |
| parent | 70b71e008cc968ee53d6b8af9f7a006f13c27e2a (diff) | |
Merge tag 'upstream/2.3.2'
Upstream version 2.3.2
Diffstat (limited to 'src/openvpn/crypto_openssl.c')
| -rw-r--r-- | src/openvpn/crypto_openssl.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/openvpn/crypto_openssl.c b/src/openvpn/crypto_openssl.c index 21d1762..1501bc8 100644 --- a/src/openvpn/crypto_openssl.c +++ b/src/openvpn/crypto_openssl.c @@ -194,7 +194,8 @@ crypto_init_lib_engine (const char *engine_name) void crypto_init_lib (void) { -#ifndef USE_SSL +#ifndef ENABLE_SSL + /* If SSL is enabled init is taken care of in ssl_openssl.c */ #ifndef ENABLE_SMALL ERR_load_crypto_strings (); #endif @@ -215,7 +216,8 @@ crypto_init_lib (void) void crypto_uninit_lib (void) { -#ifndef USE_SSL +#ifndef ENABLE_SSL + /* If SSL is enabled cleanup is taken care of in ssl_openssl.c */ EVP_cleanup (); #ifndef ENABLE_SMALL ERR_free_strings (); |