www/apache22/files/patch-modules__ssl__ssl_engine_init.c

   1 --- modules/ssl/ssl_engine_init.c.orig  2014-07-16 06:04:38 UTC
   2 +++ modules/ssl/ssl_engine_init.c
   3 @@ -406,9 +406,11 @@ void ssl_init_Engine(server_rec *s, apr_
   4              ssl_die();
   5          }
   6
   7 +#ifdef ENGINE_CTRL_CHIL_SET_FORKCHECK
   8          if (strEQ(mc->szCryptoDevice, "chil")) {
   9              ENGINE_ctrl(e, ENGINE_CTRL_CHIL_SET_FORKCHECK, 1, 0, 0);
  10          }
  11 +#endif
  12
  13          if (!ENGINE_set_default(e, ENGINE_METHOD_ALL)) {
  14              ap_log_error(APLOG_MARK, APLOG_ERR, 0, s,
  15 @@ -584,6 +586,10 @@ static void ssl_init_ctx_protocol(server
  16  #endif
  17
  18
  19 +#ifdef SSL_NO_COMP
  20 +#define OPENSSL_NO_COMP
  21 +#endif
  22 +
  23  #ifndef OPENSSL_NO_COMP
  24      if (sc->compression != TRUE) {
  25  #ifdef SSL_OP_NO_COMPRESSION
  26 @@ -831,7 +837,11 @@ static void ssl_init_ctx_cert_chain(serv
  27          }
  28      }
  29
  30 -    n = SSL_CTX_use_certificate_chain(mctx->ssl_ctx,
  31 +#ifndef HAVE_SSL_CTX_USE_CERTIFICATE_CHAIN
  32 +          n = SSL_CTX_use_certificate_chain(mctx->ssl_ctx,
  33 +#else
  34 +          n = _SSL_CTX_use_certificate_chain(mctx->ssl_ctx,
  35 +#endif
  36                                        (char *)chain,
  37                                        skip_first, NULL);
  38      if (n < 0) {