X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fdane-openssl.c;h=97acccb5ab9fa1e7395b60991edd6004ecd2902a;hb=0d81dabc92972f340421d0f80fc04156215e2eb8;hp=aa4760b94f55849152cedd2328d1cf5f98f2f4be;hpb=4c04137d73637107669e02b21f890387aaa2ef34;p=exim.git diff --git a/src/src/dane-openssl.c b/src/src/dane-openssl.c index aa4760b94..97acccb5a 100644 --- 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 +#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) # define EXIM_HAVE_ASN1_MACROS # define EXIM_OPAQUE_X509 #else @@ -667,7 +667,7 @@ for (n = sk_X509_num(in); n > 0; --n, ++depth) { if (grow_chain(dane, UNTRUSTED, ca)) { - if (!X509_check_issued(ca, ca) == X509_V_OK) + if (X509_check_issued(ca, ca) != X509_V_OK) { /* Restart with issuer as subject */ cert = ca; @@ -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)) {