libs/getdns/patches/020-openssl-no-dynamic.patch

   1 --- a/CMakeLists.txt
   2 +++ b/CMakeLists.txt
   3 @@ -334,6 +334,9 @@ check_include_file(openssl/err.h HAVE_OPENSSL_ERR_H)
   4  check_include_file(openssl/rand.h HAVE_OPENSSL_RAND_H)
   5  check_include_file(openssl/conf.h HAVE_OPENSSL_CONF_H)
   6  check_include_file(openssl/engine.h HAVE_OPENSSL_ENGINE_H)
   7 +check_include_file(openssl/bn.h HAVE_OPENSSL_BN_H)
   8 +check_include_file(openssl/dsa.h HAVE_OPENSSL_DSA_H)
   9 +check_include_file(openssl/rsa.h HAVE_OPENSSL_RSA_H)
  10
  11  set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES})
  12  check_function_exists(DSA_SIG_set0 HAVE_DSA_SIG_SET0)
  13 --- a/cmake/include/cmakeconfig.h.in
  14 +++ b/cmake/include/cmakeconfig.h.in
  15 @@ -58,6 +58,9 @@
  16  #cmakedefine HAVE_OPENSSL_RAND_H        1
  17  #cmakedefine HAVE_OPENSSL_CONF_H        1
  18  #cmakedefine HAVE_OPENSSL_ENGINE_H      1
  19 +#cmakedefine HAVE_OPENSSL_BN_H          1
  20 +#cmakedefine HAVE_OPENSSL_DSA_H         1
  21 +#cmakedefine HAVE_OPENSSL_RSA_H         1
  22
  23  #cmakedefine HAVE_DSA_SIG_SET0         1
  24  #cmakedefine HAVE_DSA_SET0_PQG         1
  25 --- a/src/openssl/keyraw-internal.c
  26 +++ b/src/openssl/keyraw-internal.c
  27 @@ -21,10 +21,10 @@
  28  #include <openssl/err.h>
  29  #include <openssl/md5.h>
  30  #ifdef HAVE_OPENSSL_CONF_H
  31 -# include <openssl/conf.h>
  32 +#include <openssl/conf.h>
  33  #endif
  34  #ifdef HAVE_OPENSSL_ENGINE_H
  35 -#  include <openssl/engine.h>
  36 +#include <openssl/engine.h>
  37  #endif
  38  #ifdef HAVE_OPENSSL_BN_H
  39  #include <openssl/bn.h>
  40 @@ -35,6 +35,9 @@
  41  #ifdef HAVE_OPENSSL_DSA_H
  42  #include <openssl/dsa.h>
  43  #endif
  44 +#ifdef HAVE_OPENSSL_RSA_H
  45 +#include <openssl/rsa.h>
  46 +#endif
  47  #endif /* HAVE_SSL */
  48
  49  #ifdef HAVE_SSL
  50 @@ -74,7 +77,6 @@ gldns_key_EVP_load_gost_id(void)
  51         if(!e) {
  52                 /* load it ourself, in case statically linked */
  53                 ENGINE_load_builtin_engines();
  54 -               ENGINE_load_dynamic();
  55                 e = ENGINE_by_id("gost");
  56         }
  57         if(!e) {