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

(-)socat/Makefile (-1 / +1 lines)
Lines 12-18 Link Here
12
12
13
LICENSE=	GPLv2
13
LICENSE=	GPLv2
14
14
15
USES=		compiler tar:bzip2
15
USES=		compiler tar:bzip2 cpe
16
GNU_CONFIGURE=	yes
16
GNU_CONFIGURE=	yes
17
USE_RC_SUBR=	socat
17
USE_RC_SUBR=	socat
18
USE_OPENSSL=	yes
18
USE_OPENSSL=	yes
(-)socat/files/patch-doc_socat.1 (+42 lines)
Line 0 Link Here
1
--- doc/socat.1.orig	2015-01-24 16:30:52 UTC
2
+++ doc/socat.1
3
@@ -2904,10 +2904,6 @@ in this file\&.
4
 Specifies the directory with the trusted (root) certificates\&. The directory
5
 must contain certificates in PEM format and their hashes (see OpenSSL
6
 documentation) 
7
-.IP "\fB\f(CWegd=<filename>\fP\fP"
8
-On some systems, openssl requires an explicit source of random data\&. Specify
9
-the socket name where an entropy gathering daemon like egd provides random
10
-data, e\&.g\&. /dev/egd\-pool\&.
11
 .IP "\fB\f(CWpseudo\fP\fP"
12
 On systems where openssl cannot find an entropy source and where no entropy
13
 gathering daemon can be utilized, this option activates a mechanism for
14
@@ -3397,11 +3393,11 @@ connection, invokes a shell\&. This shel
15
 connected to the TCP socket (nofork)\&.  The shell starts filan and lets it print the socket addresses to
16
 stderr (your terminal window)\&.
17
 .IP 
18
-.IP "\fB\f(CWecho \-e \(dq\&\e0\e14\e0\e0\ec\(dq\& |socat \-u \- file:/usr/bin/squid\&.exe,seek=0x00074420\fP\fP"
19
+.IP "\fB\f(CWecho \-e \(dq\&\e0\e14\e0\e0\ec\(dq\& |socat \-u \- file:${LOCALBASE}/bin/squid\&.exe,seek=0x00074420\fP\fP"
20
 
21
 .IP 
22
 functions as primitive binary editor: it writes the 4 bytes 000 014 000 000 to
23
-the executable /usr/bin/squid at offset 0x00074420 (this is a real world patch
24
+the executable ${LOCALBASE}/bin/squid at offset 0x00074420 (this is a real world patch
25
 to make the squid executable from Cygwin run under Windows, actual per May 2004)\&.
26
 .IP 
27
 .IP "\fB\f(CWsocat \- tcp:www\&.blackhat\&.org:31337,readbytes=1000\fP\fP"
28
@@ -3524,11 +3520,11 @@ error\&. 
29
 .SH "FILES"
30
 
31
 .PP 
32
-/usr/bin/socat 
33
+${LOCALBASE}/bin/socat 
34
 .br 
35
-/usr/bin/filan 
36
+${LOCALBASE}/bin/filan 
37
 .br 
38
-/usr/bin/procan
39
+${LOCALBASE}/bin/procan
40
 .PP 
41
 .SH "ENVIRONMENT VARIABLES"
42
 
(-)socat/files/patch-doc_socat.html (+39 lines)
Line 0 Link Here
1
--- doc/socat.html.orig	2015-01-24 16:31:04 UTC
2
+++ doc/socat.html
3
@@ -2781,10 +2781,6 @@ These options apply to the <a href="soca
4
    Specifies the directory with the trusted (root) certificates. The directory
5
    must contain certificates in PEM format and their hashes (see OpenSSL
6
    documentation) 
7
-<a name="OPTION_OPENSSL_EGD"></a><p><dt><strong><strong><code>egd=&lt;filename&gt;</code></strong></strong><dd>
8
-   On some systems, openssl requires an explicit source of random data. Specify
9
-   the socket name where an entropy gathering daemon like egd provides random
10
-   data, e.g. /dev/egd-pool.
11
 <a name="OPTION_OPENSSL_PSEUDO"></a><p><dt><strong><strong><code>pseudo</code></strong></strong><dd>
12
    On systems where openssl cannot find an entropy source and where no entropy
13
    gathering daemon can be utilized, this option activates a mechanism for
14
@@ -3309,10 +3305,10 @@ connection, invokes a shell. This shell 
15
 connected to the TCP socket (<a href="socat.html#OPTION_NOFORK">nofork</a>).  The shell starts filan and lets it print the socket addresses to
16
 stderr (your terminal window).
17
 <p>
18
-<p><dt><strong><strong><code>echo -e "\0\14\0\0\c" |socat -u - file:/usr/bin/squid.exe,seek=0x00074420</code></strong></strong><dd>
19
+<p><dt><strong><strong><code>echo -e "\0\14\0\0\c" |socat -u - file:${LOCALBASE}/bin/squid.exe,seek=0x00074420</code></strong></strong><dd>
20
 <p>
21
 functions as primitive binary editor: it writes the 4 bytes 000 014 000 000 to
22
-the executable /usr/bin/squid at offset 0x00074420 (this is a real world patch
23
+the executable ${LOCALBASE}/bin/squid at offset 0x00074420 (this is a real world patch
24
 to make the squid executable from Cygwin run under Windows, actual per May 2004).
25
 <p>
26
 <p><dt><strong><strong><code>socat - tcp:www.blackhat.org:31337,readbytes=1000</code></strong></strong><dd>
27
@@ -3430,9 +3426,9 @@ error. 
28
 <a name="FILES"></a>
29
 <h2>FILES</h2>
30
 <p>
31
-/usr/bin/socat <br>
32
-/usr/bin/filan <br>
33
-/usr/bin/procan
34
+${LOCALBASE}/bin/socat <br>
35
+${LOCALBASE}/bin/filan <br>
36
+${LOCALBASE}/bin/procan
37
 <p>
38
 <a name="ENVIRONMENT_VARIABLES"></a>
39
 <h2>ENVIRONMENT VARIABLES</h2>
(-)socat/files/patch-doc_xio.help (+22 lines)
Line 0 Link Here
1
--- doc/xio.help.orig	2013-06-23 06:16:48 UTC
2
+++ doc/xio.help
3
@@ -4566,19 +4566,6 @@ must contain certificates in PEM format 
4
 documentation) 
5
 
6
 
7
-Option: openssl-egd=file
8
-Aliases: egd
9
-
10
-Type: FILENAME
11
-Option group: OPENSSL
12
-Phase: SPEC
13
-Platforms: (depends on openssl installation)
14
-
15
-On some systems, openssl requires an explicit source of random data. Specify
16
-the socket name where an entropy gathering daemon like egd provides random
17
-data, e.g. /dev/egd-pool.
18
-
19
-
20
 Option: openssl-pseudo
21
 Aliases: pseudo
22
 
(-)socat/files/patch-error.h (-1 / +1 lines)
Lines 1-4 Link Here
1
--- error.h.orig	2015-01-26 09:59:47 UTC
1
--- error.h.orig	2015-01-24 10:15:22 UTC
2
+++ error.h
2
+++ error.h
3
@@ -229,8 +229,8 @@ struct diag_dgram {
3
@@ -229,8 +229,8 @@ struct diag_dgram {
4
 } ;
4
 } ;
(-)socat/files/patch-sslcls.c (+26 lines)
Line 0 Link Here
1
--- sslcls.c.orig	2015-01-24 10:15:22 UTC
2
+++ sslcls.c
3
@@ -331,14 +331,6 @@ void sycSSL_free(SSL *ssl) {
4
    return;
5
 }
6
 
7
-int sycRAND_egd(const char *path) {
8
-   int result;
9
-   Debug1("RAND_egd(\"%s\")", path);
10
-   result = RAND_egd(path);
11
-   Debug1("RAND_egd() -> %d", result);
12
-   return result;
13
-}
14
-
15
 DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u) {
16
    DH *result;
17
    Debug4("PEM_read_bio_DHparams(%p, %p, %p, %p)",
18
@@ -375,7 +367,7 @@ int sycFIPS_mode_set(int onoff) {
19
 }
20
 #endif /* WITH_FIPS */
21
 
22
-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
23
+#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
24
 const COMP_METHOD *sycSSL_get_current_compression(SSL *ssl) {
25
    const COMP_METHOD *result;
26
    Debug1("SSL_get_current_compression(%p)", ssl);
(-)socat/files/patch-sslcls.h (+27 lines)
Line 0 Link Here
1
--- sslcls.h.orig	2015-01-24 10:15:22 UTC
2
+++ sslcls.h
3
@@ -47,7 +47,6 @@ X509 *sycSSL_get_peer_certificate(SSL *s
4
 int sycSSL_shutdown(SSL *ssl);
5
 void sycSSL_CTX_free(SSL_CTX *ctx);
6
 void sycSSL_free(SSL *ssl);
7
-int sycRAND_egd(const char *path);
8
 
9
 DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u);
10
 
11
@@ -55,7 +54,7 @@ BIO *sycBIO_new_file(const char *filenam
12
 
13
 int sycFIPS_mode_set(int onoff);
14
 
15
-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
16
+#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
17
 const COMP_METHOD *sycSSL_get_current_compression(SSL *ssl);
18
 const COMP_METHOD *sycSSL_get_current_expansion(SSL *ssl);
19
 const char *sycSSL_COMP_get_name(const COMP_METHOD *comp);
20
@@ -98,7 +97,6 @@ const char *sycSSL_COMP_get_name(const C
21
 #define sycSSL_shutdown(s) SSL_shutdown(s)
22
 #define sycSSL_CTX_free(c) SSL_CTX_free(c)
23
 #define sycSSL_free(s) SSL_free(s)
24
-#define sycRAND_egd(p) RAND_egd(p)
25
 
26
 #define sycPEM_read_bio_DHparams(b,x,p,u) PEM_read_bio_DHparams(b,x,p,u)
27
 
(-)socat/files/patch-test.sh (+12 lines)
Line 0 Link Here
1
--- test.sh.orig	2015-01-24 10:15:22 UTC
2
+++ test.sh
3
@@ -576,9 +576,6 @@ filloptionvalues() {
4
     *,dh,*) OPTS=$(echo "$OPTS" |sed "s/,dh,/,dh=/tmp/hugo,/g");;
5
     esac
6
     case "$OPTS" in
7
-    *,egd,*) OPTS=$(echo "$OPTS" |sed "s/,egd,/,egd=/tmp/hugo,/g");;
8
-    esac
9
-    case "$OPTS" in
10
     *,compress,*) OPTS=$(echo "$OPTS" |sed "s/,compress,/,compress=none,/g");;
11
     esac
12
     # PROXY
(-)socat/files/patch-xio-openssl.c (+55 lines)
Line 0 Link Here
1
--- xio-openssl.c.orig	2015-01-24 14:33:42 UTC
2
+++ xio-openssl.c
3
@@ -108,7 +108,6 @@ const struct optdesc opt_openssl_key    
4
 const struct optdesc opt_openssl_dhparam     = { "openssl-dhparam",     "dh",    OPT_OPENSSL_DHPARAM,     GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC };
5
 const struct optdesc opt_openssl_cafile      = { "openssl-cafile",     "cafile", OPT_OPENSSL_CAFILE,      GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC };
6
 const struct optdesc opt_openssl_capath      = { "openssl-capath",     "capath", OPT_OPENSSL_CAPATH,      GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC };
7
-const struct optdesc opt_openssl_egd         = { "openssl-egd",        "egd",    OPT_OPENSSL_EGD,         GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC };
8
 const struct optdesc opt_openssl_pseudo      = { "openssl-pseudo",     "pseudo", OPT_OPENSSL_PSEUDO,      GROUP_OPENSSL, PH_SPEC, TYPE_BOOL,     OFUNC_SPEC };
9
 #if OPENSSL_VERSION_NUMBER >= 0x00908000L
10
 const struct optdesc opt_openssl_compress    = { "openssl-compress",   "compress", OPT_OPENSSL_COMPRESS,  GROUP_OPENSSL, PH_SPEC, TYPE_STRING,   OFUNC_SPEC };
11
@@ -147,7 +146,7 @@ int xio_reset_fips_mode(void) {
12
 static void openssl_conn_loginfo(SSL *ssl) {
13
    Notice1("SSL connection using %s", SSL_get_cipher(ssl));
14
 
15
-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
16
+#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
17
    {
18
       const COMP_METHOD *comp, *expansion;
19
 
20
@@ -722,7 +721,6 @@ int
21
    char *opt_dhparam = NULL;	/* file name of DH params */
22
    char *opt_cafile = NULL;	/* certificate authority file */
23
    char *opt_capath = NULL;	/* certificate authority directory */
24
-   char *opt_egd = NULL;	/* entropy gathering daemon socket path */
25
 #if OPENSSL_VERSION_NUMBER >= 0x00908000L
26
    char *opt_compress = NULL;	/* compression method */
27
 #endif
28
@@ -741,7 +739,6 @@ int
29
    retropt_string(opts, OPT_OPENSSL_CAPATH, &opt_capath);
30
    retropt_string(opts, OPT_OPENSSL_KEY, &opt_key);
31
    retropt_string(opts, OPT_OPENSSL_DHPARAM, &opt_dhparam);
32
-   retropt_string(opts, OPT_OPENSSL_EGD, &opt_egd);
33
    retropt_bool(opts,OPT_OPENSSL_PSEUDO, &opt_pseudo);
34
 #if OPENSSL_VERSION_NUMBER >= 0x00908000L
35
    retropt_string(opts, OPT_OPENSSL_COMPRESS, &opt_compress);
36
@@ -877,10 +874,6 @@ int
37
       }
38
    }
39
 
40
-   if (opt_egd) {
41
-      sycRAND_egd(opt_egd);
42
-   }
43
-
44
    if (opt_pseudo) {
45
       long int randdata;
46
       /* initialize libc random from actual microseconds */
47
@@ -1098,7 +1091,7 @@ static int openssl_SSL_ERROR_SSL(int lev
48
       if (e == ((ERR_LIB_RAND<<24)|
49
 		(RAND_F_SSLEAY_RAND_BYTES<<12)|
50
 		(RAND_R_PRNG_NOT_SEEDED)) /*0x24064064*/) {
51
-	 Error("too few entropy; use options \"egd\" or \"pseudo\"");
52
+	 Error("too few entropy; use options \"pseudo\"");
53
 	 stat = STAT_NORETRY;
54
       } else {
55
 	 Msg2(level, "%s(): %s", funcname, ERR_error_string(e, buf));
(-)socat/files/patch-xio-openssl.h (+10 lines)
Line 0 Link Here
1
--- xio-openssl.h.orig	2015-01-24 10:15:22 UTC
2
+++ xio-openssl.h
3
@@ -21,7 +21,6 @@ extern const struct optdesc opt_openssl_
4
 extern const struct optdesc opt_openssl_dhparam;
5
 extern const struct optdesc opt_openssl_cafile;
6
 extern const struct optdesc opt_openssl_capath;
7
-extern const struct optdesc opt_openssl_egd;
8
 extern const struct optdesc opt_openssl_pseudo;
9
 #if OPENSSL_VERSION_NUMBER >= 0x00908000L
10
 extern const struct optdesc opt_openssl_compress;
(-)socat/files/patch-xioopts.c (+18 lines)
Line 0 Link Here
1
--- xioopts.c.orig	2015-01-24 10:15:22 UTC
2
+++ xioopts.c
3
@@ -412,7 +412,6 @@ const struct optname optionnames[] = {
4
 #ifdef ECHOPRT
5
 	IF_TERMIOS("echoprt",	&opt_echoprt)
6
 #endif
7
-	IF_OPENSSL("egd",	&opt_openssl_egd)
8
 	IF_ANY    ("end-close",	&opt_end_close)
9
 	IF_TERMIOS("eof",	&opt_veof)
10
 	IF_TERMIOS("eol",	&opt_veol)
11
@@ -1102,7 +1101,6 @@ const struct optname optionnames[] = {
12
 	IF_OPENSSL("openssl-compress",	&opt_openssl_compress)
13
 #endif
14
 	IF_OPENSSL("openssl-dhparam",	&opt_openssl_dhparam)
15
-	IF_OPENSSL("openssl-egd",	&opt_openssl_egd)
16
 #if WITH_FIPS
17
 	IF_OPENSSL("openssl-fips",	&opt_openssl_fips)
18
 #endif
(-)socat/files/patch-xioopts.h (+10 lines)
Line 0 Link Here
1
--- xioopts.h.orig	2015-01-24 10:15:22 UTC
2
+++ xioopts.h
3
@@ -478,7 +478,6 @@ enum e_optcode {
4
    OPT_OPENSSL_COMPRESS,
5
 #endif
6
    OPT_OPENSSL_DHPARAM,
7
-   OPT_OPENSSL_EGD,
8
    OPT_OPENSSL_FIPS,
9
    OPT_OPENSSL_KEY,
10
    OPT_OPENSSL_METHOD,

Return to bug 197192