0002-compatibility-for-openssl-3.0.patch 1004 B

12345678910111213141516171819202122232425262728293031
  1. From d93e6426ec1d8c019bd302e4599f3b91ba95fb3b Mon Sep 17 00:00:00 2001
  2. From: Jianhui Zhao <zhaojh329@gmail.com>
  3. Date: Fri, 29 Apr 2022 23:47:31 +0800
  4. Subject: [PATCH] compatibility for openssl >= 3.0
  5. Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
  6. Upstream: https://github.com/zhaojh329/ssl/commit/d93e6426ec1d8c019bd302e4599f3b91ba95fb3b
  7. Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
  8. ---
  9. openssl.c | 5 ++++-
  10. 1 file changed, 4 insertions(+), 1 deletion(-)
  11. diff --git a/openssl.c b/openssl.c
  12. index 278bab5..2169db1 100644
  13. --- a/src/ssl/openssl.c
  14. +++ b/src/ssl/openssl.c
  15. @@ -139,8 +139,11 @@ const char *ssl_last_error_string(char *buf, int len)
  16. if (ssl_err_code == SSL_ERROR_SSL) {
  17. int used;
  18. -
  19. +#if OPENSSL_VERSION_MAJOR < 3
  20. ssl_err_code = ERR_peek_error_line_data(&file, &line, &data, &flags);
  21. +#else
  22. + ssl_err_code = ERR_peek_error_all(&file, &line, NULL, &data, &flags);
  23. +#endif
  24. ERR_error_string_n(ssl_err_code, buf, len);
  25. used = strlen(buf);