[patch] files/socat-1.7.3.1-libressl.patch

socat-1.7.3.1-libressl.patch (text/plain), 4.95 KB, created by Sarah Gardner on 2016-06-04 01:15:42 UTC

diff -Naur socat-1.7.3.1-orig/sslcls.c socat-1.7.3.1/sslcls.c
--- socat-1.7.3.1-orig/sslcls.c	2015-01-24 10:15:22.000000000 +0000
+++ socat-1.7.3.1/sslcls.c	2016-06-04 01:42:16.084064512 +0100
@@ -34,7 +34,7 @@
    Debug1("SSL_library_init() -> %d", result);
    return result;
 }
-
+/*
 #if HAVE_SSLv2_client_method
 const SSL_METHOD *sycSSLv2_client_method(void) {
    const SSL_METHOD *result;
@@ -70,7 +70,7 @@
    Debug1("SSLv3_server_method() -> %p", result);
    return result;
 }
-
+*/
 const SSL_METHOD *sycSSLv23_client_method(void) {
    const SSL_METHOD *result;
    Debug("SSLv23_client_method()");
@@ -330,7 +330,7 @@
    Debug("SSL_free() -> void");
    return;
 }
-
+/*
 int sycRAND_egd(const char *path) {
    int result;
    Debug1("RAND_egd(\"%s\")", path);
@@ -338,7 +338,7 @@
    Debug1("RAND_egd() -> %d", result);
    return result;
 }
-
+*/
 DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u) {
    DH *result;
    Debug4("PEM_read_bio_DHparams(%p, %p, %p, %p)",
@@ -374,7 +374,7 @@
    return result;
 }
 #endif /* WITH_FIPS */
-
+/*
 #if OPENSSL_VERSION_NUMBER >= 0x00908000L
 const COMP_METHOD *sycSSL_get_current_compression(SSL *ssl) {
    const COMP_METHOD *result;
@@ -412,5 +412,5 @@
    return result;
 }
 #endif
-
+*/
 #endif /* WITH_SYCLS && WITH_OPENSSL */
diff -Naur socat-1.7.3.1-orig/sslcls.h socat-1.7.3.1/sslcls.h
--- socat-1.7.3.1-orig/sslcls.h	2015-01-24 10:15:22.000000000 +0000
+++ socat-1.7.3.1/sslcls.h	2016-06-04 01:36:32.772106237 +0100
@@ -10,10 +10,10 @@
 
 void sycSSL_load_error_strings(void);
 int sycSSL_library_init(void);
-const SSL_METHOD *sycSSLv2_client_method(void);
-const SSL_METHOD *sycSSLv2_server_method(void);
-const SSL_METHOD *sycSSLv3_client_method(void);
-const SSL_METHOD *sycSSLv3_server_method(void);
+//const SSL_METHOD *sycSSLv2_client_method(void);
+//const SSL_METHOD *sycSSLv2_server_method(void);
+//const SSL_METHOD *sycSSLv3_client_method(void);
+//const SSL_METHOD *sycSSLv3_server_method(void);
 const SSL_METHOD *sycSSLv23_client_method(void);
 const SSL_METHOD *sycSSLv23_server_method(void);
 const SSL_METHOD *sycTLSv1_client_method(void);
@@ -55,11 +55,11 @@
 
 int sycFIPS_mode_set(int onoff);
 
-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
+/* #if OPENSSL_VERSION_NUMBER >= 0x00908000L
 const COMP_METHOD *sycSSL_get_current_compression(SSL *ssl);
 const COMP_METHOD *sycSSL_get_current_expansion(SSL *ssl);
 const char *sycSSL_COMP_get_name(const COMP_METHOD *comp);
-#endif
+#endif */
 
 #endif /* WITH_OPENSSL */
 
@@ -69,10 +69,10 @@
 
 #define sycSSL_load_error_strings() SSL_load_error_strings()
 #define sycSSL_library_init() SSL_library_init()
-#define sycSSLv2_client_method() SSLv2_client_method()
-#define sycSSLv2_server_method() SSLv2_server_method()
-#define sycSSLv3_client_method() SSLv3_client_method()
-#define sycSSLv3_server_method() SSLv3_server_method()
+//#define sycSSLv2_client_method() SSLv2_client_method()
+//#define sycSSLv2_server_method() SSLv2_server_method()
+//#define sycSSLv3_client_method() SSLv3_client_method()
+//#define sycSSLv3_server_method() SSLv3_server_method()
 #define sycSSLv23_client_method() SSLv23_client_method()
 #define sycSSLv23_server_method() SSLv23_server_method()
 #define sycTLSv1_client_method() TLSv1_client_method()
diff -Naur socat-1.7.3.1-orig/xio-openssl.c socat-1.7.3.1/xio-openssl.c
--- socat-1.7.3.1-orig/xio-openssl.c	2016-01-29 10:28:38.000000000 +0000
+++ socat-1.7.3.1/xio-openssl.c	2016-06-04 01:41:40.350744432 +0100
@@ -146,7 +146,7 @@
 
 static void openssl_conn_loginfo(SSL *ssl) {
    Notice1("SSL connection using %s", SSL_get_cipher(ssl));
-
+/*
 #if OPENSSL_VERSION_NUMBER >= 0x00908000L
    {
       const COMP_METHOD *comp, *expansion;
@@ -159,7 +159,7 @@
       Notice1("SSL connection expansion \"%s\"",
               expansion?sycSSL_COMP_get_name(expansion):"none");
    }
-#endif
+#endif */
 }
 
 /* the open function for OpenSSL client */
@@ -722,7 +722,7 @@
    char *opt_dhparam = NULL;	/* file name of DH params */
    char *opt_cafile = NULL;	/* certificate authority file */
    char *opt_capath = NULL;	/* certificate authority directory */
-   char *opt_egd = NULL;	/* entropy gathering daemon socket path */
+//   char *opt_egd = NULL;	/* entropy gathering daemon socket path */
 #if OPENSSL_VERSION_NUMBER >= 0x00908000L
    char *opt_compress = NULL;	/* compression method */
 #endif
@@ -741,7 +741,7 @@
    retropt_string(opts, OPT_OPENSSL_CAPATH, &opt_capath);
    retropt_string(opts, OPT_OPENSSL_KEY, &opt_key);
    retropt_string(opts, OPT_OPENSSL_DHPARAM, &opt_dhparam);
-   retropt_string(opts, OPT_OPENSSL_EGD, &opt_egd);
+//   retropt_string(opts, OPT_OPENSSL_EGD, &opt_egd);
    retropt_bool(opts,OPT_OPENSSL_PSEUDO, &opt_pseudo);
 #if OPENSSL_VERSION_NUMBER >= 0x00908000L
    retropt_string(opts, OPT_OPENSSL_COMPRESS, &opt_compress);
@@ -877,9 +877,9 @@
       }
    }
 
-   if (opt_egd) {
-      sycRAND_egd(opt_egd);
-   }
+//   if (opt_egd) {
+//      sycRAND_egd(opt_egd);
+//   }
 
    if (opt_pseudo) {
       long int randdata;