summaryrefslogtreecommitdiff
path: root/package/socat/patches/patch-xio-openssl_c
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2015-12-29 23:42:54 +0100
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2015-12-29 23:43:04 +0100
commitac312feacd492d85718493ced849fe6318e2c1e2 (patch)
tree1f1a8f76e1548e990c8653ec431dd43a72106df6 /package/socat/patches/patch-xio-openssl_c
parent102c11bb821d18d30b41bbbf73e713d09fb1ee54 (diff)
socat: fix compile with libressl
Diffstat (limited to 'package/socat/patches/patch-xio-openssl_c')
-rw-r--r--package/socat/patches/patch-xio-openssl_c49
1 files changed, 49 insertions, 0 deletions
diff --git a/package/socat/patches/patch-xio-openssl_c b/package/socat/patches/patch-xio-openssl_c
new file mode 100644
index 000000000..a55f0ddd3
--- /dev/null
+++ b/package/socat/patches/patch-xio-openssl_c
@@ -0,0 +1,49 @@
+--- socat-1.7.3.0.orig/xio-openssl.c 2015-01-24 15:33:42.000000000 +0100
++++ socat-1.7.3.0/xio-openssl.c 2015-12-29 23:38:49.000000000 +0100
+@@ -110,7 +110,7 @@ const struct optdesc opt_openssl_cafile
+ const struct optdesc opt_openssl_capath = { "openssl-capath", "capath", OPT_OPENSSL_CAPATH, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC };
+ const struct optdesc opt_openssl_egd = { "openssl-egd", "egd", OPT_OPENSSL_EGD, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC };
+ const struct optdesc opt_openssl_pseudo = { "openssl-pseudo", "pseudo", OPT_OPENSSL_PSEUDO, GROUP_OPENSSL, PH_SPEC, TYPE_BOOL, OFUNC_SPEC };
+-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
++#if !defined(OPENSSL_NO_COMP)
+ const struct optdesc opt_openssl_compress = { "openssl-compress", "compress", OPT_OPENSSL_COMPRESS, GROUP_OPENSSL, PH_SPEC, TYPE_STRING, OFUNC_SPEC };
+ #endif
+ #if WITH_FIPS
+@@ -147,7 +147,7 @@ int xio_reset_fips_mode(void) {
+ static void openssl_conn_loginfo(SSL *ssl) {
+ Notice1("SSL connection using %s", SSL_get_cipher(ssl));
+
+-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
++#if !defined(OPENSSL_NO_COMP)
+ {
+ const COMP_METHOD *comp, *expansion;
+
+@@ -651,7 +651,7 @@ int _xioopen_openssl_listen(struct singl
+ #endif /* WITH_LISTEN */
+
+
+-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
++#if !defined(OPENSSL_NO_COMP)
+ /* In OpenSSL 0.9.7 compression methods could be added using
+ * SSL_COMP_add_compression_method(3), but the implemntation is not compatible
+ * with the standard (RFC3749).
+@@ -743,7 +743,7 @@ int
+ retropt_string(opts, OPT_OPENSSL_DHPARAM, &opt_dhparam);
+ retropt_string(opts, OPT_OPENSSL_EGD, &opt_egd);
+ retropt_bool(opts,OPT_OPENSSL_PSEUDO, &opt_pseudo);
+-#if OPENSSL_VERSION_NUMBER >= 0x00908000L
++#if !defined(OPENSSL_NO_COMP)
+ retropt_string(opts, OPT_OPENSSL_COMPRESS, &opt_compress);
+ #endif
+ #if WITH_FIPS
+@@ -877,10 +877,6 @@ int
+ }
+ }
+
+- if (opt_egd) {
+- sycRAND_egd(opt_egd);
+- }
+-
+ if (opt_pseudo) {
+ long int randdata;
+ /* initialize libc random from actual microseconds */