View | Details | Raw Unified | Return to bug 7199
Collapse All | Expand All

(-)spamc/libspamc.c.orig (-2 / +2 lines)
Lines 1216-1222 int message_filter(struct transport *tp, const char *u Link Here
1216
	if (flags & SPAMC_TLSV1) {
1216
	if (flags & SPAMC_TLSV1) {
1217
	    meth = TLSv1_client_method();
1217
	    meth = TLSv1_client_method();
1218
	} else {
1218
	} else {
1219
	    meth = SSLv3_client_method(); /* default */
1219
	    meth = SSLv23_client_method(); /* default */
1220
	}
1220
	}
1221
	SSL_load_error_strings();
1221
	SSL_load_error_strings();
1222
	ctx = SSL_CTX_new(meth);
1222
	ctx = SSL_CTX_new(meth);
Lines 1604-1610 int message_tell(struct transport *tp, const char *use Link Here
1604
    if (flags & SPAMC_USE_SSL) {
1604
    if (flags & SPAMC_USE_SSL) {
1605
#ifdef SPAMC_SSL
1605
#ifdef SPAMC_SSL
1606
	SSLeay_add_ssl_algorithms();
1606
	SSLeay_add_ssl_algorithms();
1607
	meth = SSLv3_client_method();
1607
	meth = SSLv23_client_method();
1608
	SSL_load_error_strings();
1608
	SSL_load_error_strings();
1609
	ctx = SSL_CTX_new(meth);
1609
	ctx = SSL_CTX_new(meth);
1610
#else
1610
#else
(-)spamd/spamd.raw.orig (-3 / +3 lines)
Lines 1071-1077 sub server_sock_setup_inet { Link Here
1071
    $sockopt{V6Only} = 1  if $io_socket_module_name eq 'IO::Socket::IP'
1071
    $sockopt{V6Only} = 1  if $io_socket_module_name eq 'IO::Socket::IP'
1072
                             && IO::Socket::IP->VERSION >= 0.09;
1072
                             && IO::Socket::IP->VERSION >= 0.09;
1073
    %sockopt = (%sockopt, (
1073
    %sockopt = (%sockopt, (
1074
      SSL_version     => $sslversion,
1075
      SSL_verify_mode => 0x00,
1074
      SSL_verify_mode => 0x00,
1076
      SSL_key_file    => $opt{'server-key'},
1075
      SSL_key_file    => $opt{'server-key'},
1077
      SSL_cert_file   => $opt{'server-cert'},
1076
      SSL_cert_file   => $opt{'server-cert'},
Lines 1092-1098 sub server_sock_setup_inet { Link Here
1092
    if (!$server_inet) {
1091
    if (!$server_inet) {
1093
      $diag = sprintf("could not create %s socket on [%s]:%s: %s",
1092
      $diag = sprintf("could not create %s socket on [%s]:%s: %s",
1094
                      $ssl ? 'IO::Socket::SSL' : $io_socket_module_name,
1093
                      $ssl ? 'IO::Socket::SSL' : $io_socket_module_name,
1095
                      $adr, $port, $!);
1094
                      $adr, $port, $ssl && $IO::Socket::SSL::SSL_ERROR ?
1095
                      "$!,$IO::Socket::SSL::SSL_ERROR" : $!);
1096
      push(@diag_fail, $diag);
1096
      push(@diag_fail, $diag);
1097
    } else {
1097
    } else {
1098
      $diag = sprintf("created %s socket on [%s]:%s",
1098
      $diag = sprintf("created %s socket on [%s]:%s",
Lines 1521-1527 sub accept_from_any_server_socket { Link Here
1521
    } # end multiple sockets case
1521
    } # end multiple sockets case
1522
1522
1523
    if ($selected_socket_info) {
1523
    if ($selected_socket_info) {
1524
      my $socket = $selected_socket_info->{socket};
1524
      $socket = $selected_socket_info->{socket};
1525
      $socket or die "no socket???, impossible";
1525
      $socket or die "no socket???, impossible";
1526
      dbg("spamd: accept() on fd %d", $selected_socket_info->{fd});
1526
      dbg("spamd: accept() on fd %d", $selected_socket_info->{fd});
1527
      $client = $socket->accept;
1527
      $client = $socket->accept;

Return to bug 7199