patch file cleanup... ick.. kaloz you owe me some love
[packages.git] / net / rrs / patches / 002-no_sslv2.patch
1 diff -ruN rrs-1.70-old/rrs.c rrs-1.70-new/rrs.c
2 --- rrs-1.70-old/rrs.c  2006-12-18 11:41:42.000000000 +0100
3 +++ rrs-1.70-new/rrs.c  2006-12-18 11:53:43.000000000 +0100
4 @@ -1826,9 +1826,12 @@
5                  }
6                  rrs_ssl = TLSv1;
7                  if (optarg) {
8 +#ifndef OPENSSL_NO_SSL2                    
9                      if (!strcasecmp(optarg, "SSLv2")) {
10                          rrs_ssl = SSLv2;
11 -                    } else if (!strcasecmp(optarg, "SSLv3")) {
12 +                    } else
13 +#endif
14 +                   if (!strcasecmp(optarg, "SSLv3")) {
15                          rrs_ssl = SSLv3;
16                      } else if (!strcasecmp(optarg, "TLSv1")) {
17                          rrs_ssl = TLSv1;
18 @@ -1981,9 +1984,12 @@
19          SSL_load_error_strings();
20  
21          if (rrs_listen) {
22 +#ifndef OPENSSL_NO_SSL2
23              if (rrs_ssl == SSLv2) {
24                  sslmethod = SSLv2_server_method();
25 -            } else if (rrs_ssl == SSLv3) {
26 +            } else
27 +#endif
28 +           if (rrs_ssl == SSLv3) {
29                  sslmethod = SSLv3_server_method();
30              } else if (rrs_ssl == TLSv1) {
31                  sslmethod = TLSv1_server_method();
32 @@ -1992,9 +1998,12 @@
33                  return err_generic;
34              }
35          } else {
36 +#ifndef OPENSSL_NO_SSL2
37              if (rrs_ssl == SSLv2) {
38                  sslmethod = SSLv2_client_method();
39 -            } else if (rrs_ssl == SSLv3) {
40 +            } else
41 +#endif
42 +           if (rrs_ssl == SSLv3) {
43                  sslmethod = SSLv3_client_method();
44              } else if (rrs_ssl == TLSv1) {
45                  sslmethod = TLSv1_client_method();