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.

24 lines
793 B

  1. From 0b17cf6e39064b008792811a6babf4cd75ac7744 Mon Sep 17 00:00:00 2001
  2. From: Eneas U de Queiroz <cote2004-github@yahoo.com>
  3. Date: Mon, 25 Feb 2019 10:48:48 -0300
  4. Subject: [PATCH] tls.c: allow build with no openssl engine support
  5. This avoids an ENGINE_cleanup call if openssl was compiled without
  6. engine support.
  7. Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
  8. diff --git a/src/main/tls.c b/src/main/tls.c
  9. index 73f0e3a3e8..9726953234 100644
  10. --- a/src/main/tls.c
  11. +++ b/src/main/tls.c
  12. @@ -2743,7 +2743,9 @@ void tls_global_cleanup(void)
  13. #elif OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
  14. ERR_remove_thread_state(NULL);
  15. #endif
  16. +#ifndef OPENSSL_NO_ENGINE
  17. ENGINE_cleanup();
  18. +#endif
  19. CONF_modules_unload(1);
  20. ERR_free_strings();
  21. EVP_cleanup();