tdeio-kssl_libressl.patch 1.5 KB

123456789101112131415161718192021222324252627282930313233343536373839
  1. --- tdelibs-trinity-14.0.7/tdeio/kssl/kopenssl.cc.orig 2019-12-04 16:13:48.000000000 -0300
  2. +++ tdelibs-trinity-14.0.7/tdeio/kssl/kopenssl.cc 2020-01-18 17:20:38.842247950 -0300
  3. @@ -2048,7 +2048,7 @@
  4. return a->type;
  5. #endif
  6. kdWarning() << "X509_OBJECT_get_type not defined!" << endl;
  7. -#if OPENSSL_VERSION_NUMBER >= 0x10100000L
  8. +#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
  9. return X509_LU_NONE;
  10. #else
  11. return 0;
  12. @@ -2057,7 +2057,7 @@
  13. X509* KOpenSSLProxy::X509_OBJECT_get0_X509(const X509_OBJECT *a) {
  14. if (K_X509_OBJECT_get0_X509) return (K_X509_OBJECT_get0_X509)(a);
  15. -#if OPENSSL_VERSION_NUMBER < 0x10100000L
  16. +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
  17. return a->data.x509;
  18. #endif
  19. kdWarning() << "X509_OBJECT_get0_X509 not defined!" << endl;
  20. @@ -2067,7 +2067,7 @@
  21. ASN1_TIME* KOpenSSLProxy::X509_getm_notAfter(const X509 *x) {
  22. if (K_X509_getm_notAfter) return (K_X509_getm_notAfter)(x);
  23. -#if OPENSSL_VERSION_NUMBER < 0x10100000L
  24. +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
  25. return X509_get_notAfter(x);
  26. #endif
  27. kdWarning() << "X509_get_notAfter not defined!" << endl;
  28. @@ -2076,7 +2076,7 @@
  29. ASN1_TIME* KOpenSSLProxy::X509_getm_notBefore(const X509 *x) {
  30. if (K_X509_getm_notBefore) return (K_X509_getm_notBefore)(x);
  31. -#if OPENSSL_VERSION_NUMBER < 0x10100000L
  32. +#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
  33. return X509_get_notBefore(x);
  34. #endif
  35. kdWarning() << "X509_get_notBefore not defined!" << endl;