mdw@git.distorted.org.uk Git - termux-packages/blob - packages/socat/xio-openssl.c.patch

   1 diff -u -r ../socat-1.7.3.0/xio-openssl.c ./xio-openssl.c
   2 --- ../socat-1.7.3.0/xio-openssl.c      2015-01-24 09:33:42.000000000 -0500
   3 +++ ./xio-openssl.c     2015-03-06 15:28:09.652143441 -0500
   4 @@ -110,7 +110,7 @@
   5  const struct optdesc opt_openssl_capath      = { "openssl-capath",     "capath", OPT_OPENSSL_CAPATH,      GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC };
   6  const struct optdesc opt_openssl_egd         = { "openssl-egd",        "egd",    OPT_OPENSSL_EGD,         GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC };
   7  const struct optdesc opt_openssl_pseudo      = { "openssl-pseudo",     "pseudo", OPT_OPENSSL_PSEUDO,      GROUP_OPENSSL, PH_SPEC, TYPE_BOOL,     OFUNC_SPEC };
   8 -#if OPENSSL_VERSION_NUMBER >= 0x00908000L
   9 +#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
  10  const struct optdesc opt_openssl_compress    = { "openssl-compress",   "compress", OPT_OPENSSL_COMPRESS,  GROUP_OPENSSL, PH_SPEC, TYPE_STRING,   OFUNC_SPEC };
  11  #endif
  12  #if WITH_FIPS
  13 @@ -147,7 +147,7 @@
  14  static void openssl_conn_loginfo(SSL *ssl) {
  15     Notice1("SSL connection using %s", SSL_get_cipher(ssl));
  16
  17 -#if OPENSSL_VERSION_NUMBER >= 0x00908000L
  18 +#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
  19     {
  20        const COMP_METHOD *comp, *expansion;
  21
  22 @@ -651,7 +651,7 @@
  23  #endif /* WITH_LISTEN */
  24
  25
  26 -#if OPENSSL_VERSION_NUMBER >= 0x00908000L
  27 +#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
  28  /* In OpenSSL 0.9.7 compression methods could be added using
  29   * SSL_COMP_add_compression_method(3), but the implemntation is not compatible
  30   * with the standard (RFC3749).
  31 @@ -723,7 +723,7 @@
  32     char *opt_cafile = NULL;    /* certificate authority file */
  33     char *opt_capath = NULL;    /* certificate authority directory */
  34     char *opt_egd = NULL;       /* entropy gathering daemon socket path */
  35 -#if OPENSSL_VERSION_NUMBER >= 0x00908000L
  36 +#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
  37     char *opt_compress = NULL;  /* compression method */
  38  #endif
  39     bool opt_pseudo = false;    /* use pseudo entropy if nothing else */
  40 @@ -743,7 +743,7 @@
  41     retropt_string(opts, OPT_OPENSSL_DHPARAM, &opt_dhparam);
  42     retropt_string(opts, OPT_OPENSSL_EGD, &opt_egd);
  43     retropt_bool(opts,OPT_OPENSSL_PSEUDO, &opt_pseudo);
  44 -#if OPENSSL_VERSION_NUMBER >= 0x00908000L
  45 +#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
  46     retropt_string(opts, OPT_OPENSSL_COMPRESS, &opt_compress);
  47  #endif
  48  #if WITH_FIPS
  49 @@ -984,7 +984,7 @@
  50     }
  51  #endif /* !defined(EC_KEY) */
  52
  53 -#if OPENSSL_VERSION_NUMBER >= 0x00908000L
  54 +#if OPENSSL_VERSION_NUMBER >= 0x00908000L && !defined(OPENSSL_NO_COMP)
  55     if (opt_compress) {
  56        int result;
  57        result = openssl_setup_compression(*ctx, opt_compress);