You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

57 lines
1.7 KiB

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