| Gustavo Zacarias | 318a4d8 | 2016-03-01 15:46:09 -0300 | [diff] [blame] | 1 | From: Hilko Bengen <bengen@debian.org> |
| 2 | Date: Wed, 27 Apr 2011 00:18:42 +0200 |
| 3 | Subject: Patched out SSL2 support since it is no longer supported by OpenSSL. |
| 4 | |
| 5 | Now that openssl has dropped SSLv2 support we need to patch it out. |
| 6 | Patch picked up from debian patchseries 5. |
| 7 | |
| 8 | Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> |
| 9 | |
| 10 | --- |
| 11 | mailx.1 | 2 +- |
| 12 | openssl.c | 4 +--- |
| 13 | 2 files changed, 2 insertions(+), 4 deletions(-) |
| 14 | |
| 15 | diff --git a/mailx.1 b/mailx.1 |
| 16 | index 417ea04..a02e430 100644 |
| 17 | --- a/mailx.1 |
| 18 | +++ b/mailx.1 |
| 19 | @@ -3575,7 +3575,7 @@ Only applicable if SSL/TLS support is built using OpenSSL. |
| 20 | .TP |
| 21 | .B ssl-method |
| 22 | Selects a SSL/TLS protocol version; |
| 23 | -valid values are `ssl2', `ssl3', and `tls1'. |
| 24 | +valid values are `ssl3', and `tls1'. |
| 25 | If unset, the method is selected automatically, |
| 26 | if possible. |
| 27 | .TP |
| 28 | diff --git a/openssl.c b/openssl.c |
| 29 | index b4e33fc..44fe4e5 100644 |
| 30 | --- a/openssl.c |
| 31 | +++ b/openssl.c |
| 32 | @@ -216,9 +216,7 @@ ssl_select_method(const char *uhp) |
| 33 | |
| 34 | cp = ssl_method_string(uhp); |
| 35 | if (cp != NULL) { |
| 36 | - if (equal(cp, "ssl2")) |
| 37 | - method = SSLv2_client_method(); |
| 38 | - else if (equal(cp, "ssl3")) |
| 39 | + if (equal(cp, "ssl3")) |
| 40 | method = SSLv3_client_method(); |
| 41 | else if (equal(cp, "tls1")) |
| 42 | method = TLSv1_client_method(); |