| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [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 | This patch is taken from |
| 6 | ftp://ftp.debian.org/debian/pool/main/h/heirloom-mailx/heirloom-mailx_12.5-5.debian.tar.xz |
| 7 | |
| 8 | Upstream-Status: Inappropriate [upstream is dead] |
| 9 | --- |
| 10 | mailx.1 | 2 +- |
| 11 | openssl.c | 4 +--- |
| 12 | 2 files changed, 2 insertions(+), 4 deletions(-) |
| 13 | |
| 14 | diff --git a/mailx.1 b/mailx.1 |
| 15 | index 417ea04..a02e430 100644 |
| 16 | --- a/mailx.1 |
| 17 | +++ b/mailx.1 |
| 18 | @@ -3575,7 +3575,7 @@ Only applicable if SSL/TLS support is built using OpenSSL. |
| 19 | .TP |
| 20 | .B ssl-method |
| 21 | Selects a SSL/TLS protocol version; |
| 22 | -valid values are `ssl2', `ssl3', and `tls1'. |
| 23 | +valid values are `ssl3', and `tls1'. |
| 24 | If unset, the method is selected automatically, |
| 25 | if possible. |
| 26 | .TP |
| 27 | diff --git a/openssl.c b/openssl.c |
| 28 | index b4e33fc..44fe4e5 100644 |
| 29 | --- a/openssl.c |
| 30 | +++ b/openssl.c |
| 31 | @@ -216,9 +216,7 @@ ssl_select_method(const char *uhp) |
| 32 | |
| 33 | cp = ssl_method_string(uhp); |
| 34 | if (cp != NULL) { |
| 35 | - if (equal(cp, "ssl2")) |
| 36 | - method = SSLv2_client_method(); |
| 37 | - else if (equal(cp, "ssl3")) |
| 38 | + if (equal(cp, "ssl3")) |
| 39 | method = SSLv3_client_method(); |
| 40 | else if (equal(cp, "tls1")) |
| 41 | method = TLSv1_client_method(); |