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/protocols/ace/INet | |
| 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/protocols/ace/INet')
| -rw-r--r-- | ACE/protocols/ace/INet/HTTP_Simple_exec.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/ACE/protocols/ace/INet/HTTP_Simple_exec.cpp b/ACE/protocols/ace/INet/HTTP_Simple_exec.cpp index 65805c2c582..9dda462b99a 100644 --- a/ACE/protocols/ace/INet/HTTP_Simple_exec.cpp +++ b/ACE/protocols/ace/INet/HTTP_Simple_exec.cpp @@ -35,7 +35,11 @@ usage (void) std::cout << "\t-p <port> \t\tproxy port to connect to\n"; std::cout << "\t-o <filename> \t\tfile to write output to\n"; #if defined (ACE_HAS_SSL) && ACE_HAS_SSL == 1 - std::cout << "\t-v <ssl version>\t\tSSL version to use: 2, 23, 3\n"; + std::cout << "\t-v <ssl version>\t\tSSL version to use: "; +#if !defined (OPENSSL_NO_SSL2) + std::cout << "2, "; +#endif /* OPENSSL_NO_SSL2 */ + std::cout << "23, 3\n"; std::cout << "\t-n \t\tno peer certificate verification\n"; std::cout << "\t-i \t\tignore peer certificate verification failures\n"; std::cout << "\t-c <filename> \t\tcertificate file (PEM format)\n"; @@ -78,10 +82,12 @@ parse_args (int argc, ACE_TCHAR *argv []) case 'v': { ACE_CString ver = ACE_TEXT_ALWAYS_CHAR (get_opt.opt_arg ()); - if (ver == "2") - ssl_mode = ACE_SSL_Context::SSLv2; - else if (ver == "23") + if (ver == "23") ssl_mode = ACE_SSL_Context::SSLv23; +#if !defined (OPENSSL_NO_SSL2) + else if (ver == "2") + ssl_mode = ACE_SSL_Context::SSLv2; +#endif /* ! OPENSSL_NO_SSL2*/ else if (ver != "3") // default mode { std::cerr << "ERROR: Invalid SSL mode [" << ver << "] specfied!" << std::endl; |