neon: more fixes for libressl support
This commit is contained in:
parent
dc679b6c02
commit
19eb8a0706
2 changed files with 21 additions and 3 deletions
|
@ -1,7 +1,7 @@
|
|||
Extend the guard to be also true for libressl.
|
||||
Version number juggling for libressl
|
||||
|
||||
--- src/ne_openssl.c 2016-09-30 10:46:00.000000000 +0200
|
||||
+++ src/ne_openssl.c 2016-10-04 12:57:24.507084147 +0200
|
||||
+++ src/ne_openssl.c 2016-10-06 00:19:58.366044580 +0200
|
||||
@@ -66,7 +66,7 @@
|
||||
typedef const unsigned char ne_d2i_uchar;
|
||||
#endif
|
||||
|
@ -11,3 +11,21 @@ Extend the guard to be also true for libressl.
|
|||
#define X509_up_ref(x) x->references++
|
||||
#define EVP_PKEY_up_ref(x) x->references++
|
||||
#define EVP_PKEY_get0_RSA(evp) (evp->pkey.rsa)
|
||||
@@ -1199,7 +1199,7 @@
|
||||
|
||||
int ne__ssl_init(void)
|
||||
{
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
|
||||
CRYPTO_malloc_init();
|
||||
SSL_load_error_strings();
|
||||
SSL_library_init();
|
||||
@@ -1242,7 +1242,7 @@
|
||||
"for %" NE_FMT_SIZE_T " locks.\n", num_locks);
|
||||
}
|
||||
#endif
|
||||
-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
|
||||
+#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) */
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'neon'
|
||||
pkgname=neon
|
||||
version=0.30.2
|
||||
revision=2
|
||||
revision=3
|
||||
build_style=gnu-configure
|
||||
configure_args="--with-expat --with-ssl=openssl --enable-shared
|
||||
--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"
|
||||
|
|
Loading…
Reference in a new issue