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.

39 lines
1.2 KiB

  1. From d2a7592b9884049d3da384c5c37f77629ce9ac56 Mon Sep 17 00:00:00 2001
  2. From: Rosen Penev <rosenp@gmail.com>
  3. Date: Tue, 6 Nov 2018 18:58:30 -0800
  4. Subject: [PATCH] openssl: Fix compilation without deprecated APIs
  5. bn.h was missing. Including engine.h does not work if OpenSSL was built
  6. without it. cyrus-sasl makes no use of it anyway.
  7. ---
  8. common/crypto-compat.c | 1 -
  9. common/crypto-compat.h | 1 +
  10. 2 files changed, 1 insertion(+), 1 deletion(-)
  11. diff --git a/common/crypto-compat.c b/common/crypto-compat.c
  12. index f4717b6..8195879 100644
  13. --- a/common/crypto-compat.c
  14. +++ b/common/crypto-compat.c
  15. @@ -12,7 +12,6 @@
  16. #if defined(HAVE_OPENSSL) && (OPENSSL_VERSION_NUMBER < 0x10100000L)
  17. #include <string.h>
  18. -#include <openssl/engine.h>
  19. static void *OPENSSL_zalloc(size_t num)
  20. {
  21. diff --git a/common/crypto-compat.h b/common/crypto-compat.h
  22. index 73424ad..d3ffdca 100644
  23. --- a/common/crypto-compat.h
  24. +++ b/common/crypto-compat.h
  25. @@ -15,6 +15,7 @@
  26. #include <openssl/dh.h>
  27. #include <openssl/evp.h>
  28. #include <openssl/hmac.h>
  29. +#include <openssl/bn.h>
  30. int RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d);
  31. int RSA_set0_factors(RSA *r, BIGNUM *p, BIGNUM *q);
  32. --
  33. 2.19.1