projects
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
560e71c
)
DANE: fix build under LibreSSL. Bug 2020
author
Kirill Miazine
<km@krot.org>
Sun, 29 Jan 2017 14:55:58 +0000
(14:55 +0000)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Sun, 29 Jan 2017 14:58:53 +0000
(14:58 +0000)
src/src/dane-openssl.c
patch
|
blob
|
blame
|
history
diff --git
a/src/src/dane-openssl.c
b/src/src/dane-openssl.c
index aa4760b94f55849152cedd2328d1cf5f98f2f4be..bb927383fc879bd6a8288bba1c91467b313e5609 100644
(file)
--- a/
src/src/dane-openssl.c
+++ b/
src/src/dane-openssl.c
@@
-25,7
+25,7
@@
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
# define X509_up_ref(x) CRYPTO_add(&((x)->references), 1, CRYPTO_LOCK_X509)
#endif
#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
# define X509_up_ref(x) CRYPTO_add(&((x)->references), 1, CRYPTO_LOCK_X509)
#endif
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
&& !defined(LIBRESSL_VERSION_NUMBER)
# define EXIM_HAVE_ASN1_MACROS
# define EXIM_OPAQUE_X509
#else
# define EXIM_HAVE_ASN1_MACROS
# define EXIM_OPAQUE_X509
#else
@@
-1658,7
+1658,7
@@
dane_idx = SSL_get_ex_new_index(0, 0, 0, 0, 0);
}
}
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
|| defined(LIBRESSL_VERSION_NUMBER)
static void
run_once(volatile int * once, void (*init)(void))
{
static void
run_once(volatile int * once, void (*init)(void))
{