Update socat to 1.6.0.1 (#3654)

[openwrt/svn-archive/archive.git] / net / socat / patches / 502-no_sslv2.patch

diff --git a/net/socat/patches/502-no_sslv2.patch b/net/socat/patches/502-no_sslv2.patch
index 372383aa9f0bce60515064cc38d0ed2e1882fba6..ea6be13446ab5b3d21e992706f4bbea14b64e17f 100644 (file)
--- a/net/socat/patches/502-no_sslv2.patch
+++ b/net/socat/patches/502-no_sslv2.patch
@@ -1,6 +1,5 @@
-diff -ruN socat-1.4-old/sslcls.c socat-1.4-new/sslcls.c
---- socat-1.4-old/sslcls.c     2005-03-12 19:06:54.000000000 +0100
-+++ socat-1.4-new/sslcls.c     2006-12-18 12:26:32.000000000 +0100
+--- a/sslcls.c
++++ b/sslcls.c

 @@ -35,6 +35,7 @@
     return result;
  }
 @@ -35,6 +35,7 @@
     return result;
  }


@@ -17,10 +16,9 @@ diff -ruN socat-1.4-old/sslcls.c socat-1.4-new/sslcls.c
  
  SSL_METHOD *sycSSLv3_client_method(void) {
     SSL_METHOD *result;
  
  SSL_METHOD *sycSSLv3_client_method(void) {
     SSL_METHOD *result;

-diff -ruN socat-1.4-old/xio-openssl.c socat-1.4-new/xio-openssl.c
---- socat-1.4-old/xio-openssl.c        2005-09-04 11:40:45.000000000 +0200
-+++ socat-1.4-new/xio-openssl.c        2006-12-18 12:27:17.000000000 +0100
-@@ -612,9 +612,12 @@
+--- a/xio-openssl.c
++++ b/xio-openssl.c
+@@ -676,9 +676,12 @@

  
     if (!server) {
        if (me_str != 0) {
  
     if (!server) {
        if (me_str != 0) {


@@ -34,7 +32,7 @@ diff -ruN socat-1.4-old/xio-openssl.c socat-1.4-new/xio-openssl.c
            method = sycSSLv3_client_method();
         } else if (!strcasecmp(me_str, "SSLv23") || !strcasecmp(me_str, "SSL23") ||
                    !strcasecmp(me_str, "SSL")) {
            method = sycSSLv3_client_method();
         } else if (!strcasecmp(me_str, "SSLv23") || !strcasecmp(me_str, "SSL23") ||
                    !strcasecmp(me_str, "SSL")) {

-@@ -631,9 +634,12 @@
+@@ -695,9 +698,12 @@

        }
     } else /* server */ {
        if (me_str != 0) {
        }
     } else /* server */ {
        if (me_str != 0) {