34 lines
1.1 KiB
Plaintext
34 lines
1.1 KiB
Plaintext
$OpenBSD: patch-spamc_libspamc_c,v 1.1 2012/06/25 22:12:30 sthen Exp $
|
|
|
|
Remove the SSLv2 support.
|
|
|
|
--- spamc/libspamc.c.orig Mon Jun 25 08:00:22 2012
|
|
+++ spamc/libspamc.c Mon Jun 25 08:01:45 2012
|
|
@@ -1202,14 +1202,10 @@ int message_filter(struct transport *tp, const char *u
|
|
if (flags & SPAMC_USE_SSL) {
|
|
#ifdef SPAMC_SSL
|
|
SSLeay_add_ssl_algorithms();
|
|
- if ((flags & SPAMC_SSLV2) && (flags & SPAMC_SSLV3)) {
|
|
- meth = TLSv1_client_method(); /* both flag bits on means use TLSv1 */
|
|
- } else if (flags & SPAMC_SSLV2) {
|
|
- meth = SSLv2_client_method();
|
|
- } else if (flags & SPAMC_SSLV3) {
|
|
- meth = SSLv3_client_method();
|
|
+ if (flags & SPAMC_TLSV1) {
|
|
+ meth = TLSv1_client_method();
|
|
} else {
|
|
- meth = SSLv23_client_method(); /* no flag bits, default SSLv23 */
|
|
+ meth = SSLv3_client_method(); /* default */
|
|
}
|
|
SSL_load_error_strings();
|
|
ctx = SSL_CTX_new(meth);
|
|
@@ -1597,7 +1593,7 @@ int message_tell(struct transport *tp, const char *use
|
|
if (flags & SPAMC_USE_SSL) {
|
|
#ifdef SPAMC_SSL
|
|
SSLeay_add_ssl_algorithms();
|
|
- meth = SSLv2_client_method();
|
|
+ meth = SSLv3_client_method();
|
|
SSL_load_error_strings();
|
|
ctx = SSL_CTX_new(meth);
|
|
#else
|