diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-11-07 13:52:17 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2012-11-07 13:52:17 +0000 |
| commit | b90f360effa2927abb665a27b53f7050003c101f (patch) | |
| tree | b44cc20f25f0ef2f5961b12803cdd203fa5c16e9 /ACE/ace | |
| parent | b2282f3411c390c1e531d11e5b852a9717dfdd2d (diff) | |
| download | ATCD-b90f360effa2927abb665a27b53f7050003c101f.tar.gz | |
Wed Nov 7 13:51:14 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/SSL/SSL_Context.h:
* ace/SSL/SSL_Context.cpp:
* protocols/ace/INet/HTTP_Simple_exec.cpp:
Resolve compile problems with OpenSSL on recent debian/ubuntu
versions which don't ship SSLv2 anymore
* debian/patches/series:
* debian/patches/35_disable_sslv2.diff:
Patch is not needed anymore
Diffstat (limited to 'ACE/ace')
| -rw-r--r-- | ACE/ace/SSL/SSL_Context.cpp | 10 | ||||
| -rw-r--r-- | ACE/ace/SSL/SSL_Context.h | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/ACE/ace/SSL/SSL_Context.cpp b/ACE/ace/SSL/SSL_Context.cpp index cca47377cde..4da213484a7 100644 --- a/ACE/ace/SSL/SSL_Context.cpp +++ b/ACE/ace/SSL/SSL_Context.cpp @@ -236,6 +236,7 @@ ACE_SSL_Context::set_mode (int mode) switch (mode) { +#if !defined (OPENSSL_NO_SSL2) case ACE_SSL_Context::SSLv2_client: method = ::SSLv2_client_method (); break; @@ -245,6 +246,7 @@ ACE_SSL_Context::set_mode (int mode) case ACE_SSL_Context::SSLv2: method = ::SSLv2_method (); break; +#endif /* OPENSSL_NO_SSL2 */ case ACE_SSL_Context::SSLv3_client: method = ::SSLv3_client_method (); break; @@ -339,10 +341,12 @@ ACE_SSL_Context::load_trusted_ca (const char* ca_file, || mode_ == SSLv23_server || mode_ == TLSv1 || mode_ == TLSv1_server - || mode_ == SSLv3 - || mode_ == SSLv3_server +#if !defined (OPENSSL_NO_SSL2) || mode_ == SSLv2 - || mode_ == SSLv2_server) + || mode_ == SSLv2_server +#endif /* !OPENSSL_NO_SSL2 */ + || mode_ == SSLv3 + || mode_ == SSLv3_server) { // Note: The STACK_OF(X509_NAME) pointer is a copy of the pointer in // the CTX; any changes to it by way of these function calls will diff --git a/ACE/ace/SSL/SSL_Context.h b/ACE/ace/SSL/SSL_Context.h index 438fb19eb81..252613d389a 100644 --- a/ACE/ace/SSL/SSL_Context.h +++ b/ACE/ace/SSL/SSL_Context.h @@ -104,10 +104,12 @@ public: enum { INVALID_METHOD = -1, +#if !defined (OPENSSL_NO_SSL2) SSLv2_client = 1, SSLv2_server, SSLv2, - SSLv3_client, +#endif /* !OPENSSL_NO_SSL2 */ + SSLv3_client = 4, SSLv3_server, SSLv3, SSLv23_client, |