[patch] Fix LibreSSL 2.7

libressl-2.7.patch (text/plain), 1.82 KB, created by Tom Li on 2018-06-16 09:49:53 UTC

diff -upr neon-0.30.2/src/ne_openssl.c neon-0.30.2-libressl/src/ne_openssl.c
--- neon-0.30.2/src/ne_openssl.c	2018-06-16 13:42:43.506364383 +0800
+++ neon-0.30.2-libressl/src/ne_openssl.c	2018-06-16 13:42:18.849332381 +0800
@@ -66,7 +66,7 @@ typedef unsigned char ne_d2i_uchar;
 typedef const unsigned char ne_d2i_uchar;
 #endif
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
 #define X509_up_ref(x) x->references++
 #define EVP_PKEY_up_ref(x) x->references++
 #define EVP_PKEY_get0_RSA(evp) (evp->pkey.rsa)
diff -upr neon-0.30.2/src/ne_pkcs11.c neon-0.30.2-libressl/src/ne_pkcs11.c
--- neon-0.30.2/src/ne_pkcs11.c	2018-06-16 13:42:43.506364383 +0800
+++ neon-0.30.2-libressl/src/ne_pkcs11.c	2018-06-16 13:44:58.481697605 +0800
@@ -78,9 +78,8 @@ struct ne_ssl_pkcs11_provider_s {
 #define PK11_RSA_ERR (RSA_F_RSA_EAY_PRIVATE_ENCRYPT)
 #endif
 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
 /* Compatibility functions for OpenSSL < 1.1.0: */
-#define RSA_meth_get0_app_data(rsa) (void *)(rsa->app_data)
 static RSA_METHOD *RSA_meth_new(const char *name, int flags)
 {
     RSA_METHOD *m = ne_calloc(sizeof *m);
@@ -93,6 +92,10 @@ static RSA_METHOD *RSA_meth_new(const ch
 }
 #define RSA_meth_free ne_free
 #define RSA_meth_set_priv_enc(m, f) (m)->rsa_priv_enc = (f)
+#endif
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+/* Compatibility functions for OpenSSL < 1.1.0 and LibreSSL */
+#define RSA_meth_get0_app_data(rsa) (void *)(rsa->app_data)
 #define RSA_meth_set0_app_data(m, f) (m)->app_data = (void *)(f)
 #endif