diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-08-29 16:36:47 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-08-29 16:36:47 +0200 |
| commit | 9cfbd696dcf71d52fac9e4eb89561ceb1de4ecb6 (patch) | |
| tree | fefb9cd838bec5e5db22dca465d39a213aa3bca5 /ACE/ace/SSL | |
| parent | 014e56cc756963adb6074476e670644d96627fbf (diff) | |
| download | ATCD-9cfbd696dcf71d52fac9e4eb89561ceb1de4ecb6.tar.gz | |
OpenSSL 1.1 disables egd by default
* ACE/ace/SSL/SSL_Context.cpp:
Diffstat (limited to 'ACE/ace/SSL')
| -rw-r--r-- | ACE/ace/SSL/SSL_Context.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ACE/ace/SSL/SSL_Context.cpp b/ACE/ace/SSL/SSL_Context.cpp index 65a354e9df7..ec6869f2925 100644 --- a/ACE/ace/SSL/SSL_Context.cpp +++ b/ACE/ace/SSL/SSL_Context.cpp @@ -629,8 +629,9 @@ ACE_SSL_Context::random_seed (const char * seed) int ACE_SSL_Context::egd_file (const char * socket_file) { -#if OPENSSL_VERSION_NUMBER < 0x00905100L - // OpenSSL < 0.9.5 doesn't have EGD support. +#if OPENSSL_VERSION_NUMBER < 0x00905100L || defined (OPENSSL_NO_EGD) + // OpenSSL < 0.9.5 doesn't have EGD support. OpenSSL 1.1 and newer + // disable egd by default ACE_UNUSED_ARG (socket_file); ACE_NOTSUP_RETURN (-1); #else @@ -641,7 +642,7 @@ ACE_SSL_Context::egd_file (const char * socket_file) return 0; else return -1; -#endif /* OPENSSL_VERSION_NUMBER >= 0x00905100L */ +#endif /* OPENSSL_VERSION_NUMBER < 0x00905100L */ } int |