|
Line 0
Link Here
|
|
|
1 |
--- libsxclient/src/opensslcompat.h.orig 2016-11-16 13:50:12 UTC |
| 2 |
+++ libsxclient/src/opensslcompat.h |
| 3 |
@@ -13,7 +13,7 @@ |
| 4 |
#define hmac_final(a, b, c) (HMAC_Final((a), (b), (c)), 1) |
| 5 |
#endif |
| 6 |
|
| 7 |
-#if OPENSSL_VERSION_NUMBER < 0x10100000L|| defined (LIBRESSL_VERSION_NUMBER) |
| 8 |
+#if OPENSSL_VERSION_NUMBER < 0x10100000L|| (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) |
| 9 |
/* https://wiki.openssl.org/index.php/1.1_API_Changes#Adding_forward-compatible_code_to_older_versions */ |
| 10 |
static HMAC_CTX *HMAC_CTX_new(void) |
| 11 |
{ |
| 12 |
@@ -32,13 +32,13 @@ static void HMAC_CTX_free(HMAC_CTX *ctx) |
| 13 |
} |
| 14 |
#endif |
| 15 |
|
| 16 |
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined (LIBRESSL_VERSION_NUMBER) |
| 17 |
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) |
| 18 |
/* EVP_MD_CTX_create() and EVP_MD_CTX_destroy() were renamed to EVP_MD_CTX_new() and EVP_MD_CTX_free() in OpenSSL 1.1. */ |
| 19 |
#define EVP_MD_CTX_new EVP_MD_CTX_create |
| 20 |
#define EVP_MD_CTX_free EVP_MD_CTX_destroy |
| 21 |
#endif |
| 22 |
|
| 23 |
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) |
| 24 |
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) |
| 25 |
#define ASN1_STRING_get0_data(x) ASN1_STRING_data(x) |
| 26 |
#endif |
| 27 |
|