dns/getdns: sync with upstream

Taken from: FreeBSD
This commit is contained in:
Franco Fichtner 2022-11-23 08:37:26 +01:00
parent c2b2039a59
commit f10ee0af47
2 changed files with 0 additions and 63 deletions

View File

@ -1,34 +0,0 @@
--- configure.orig 2019-04-03 13:37:02 UTC
+++ configure
@@ -14254,10 +14254,21 @@ $as_echo_n "checking for LibreSSL... " >
if grep VERSION_TEXT $ssldir/include/openssl/opensslv.h | grep "LibreSSL" >/dev/null; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- as_fn_error $? "getdns does not support LibreSSL" "$LINENO" 5
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
+
+for ac_func in OPENSSL_init_crypto
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
fi
for ac_header in openssl/conf.h openssl/ssl.h
do :
@@ -14300,7 +14311,7 @@ fi
done
-for ac_func in OPENSSL_config EVP_md5 EVP_sha1 EVP_sha224 EVP_sha256 EVP_sha384 EVP_sha512 FIPS_mode ENGINE_load_cryptodev EVP_PKEY_keygen ECDSA_SIG_get0 EVP_MD_CTX_new EVP_PKEY_base_id HMAC_CTX_new HMAC_CTX_free TLS_client_method DSA_SIG_set0 EVP_dss1 EVP_DigestVerify OpenSSL_version_num OpenSSL_version SSL_CTX_dane_enable SSL_dane_enable SSL_dane_tlsa_add X509_check_host X509_get_notAfter X509_get0_notAfter SSL_CTX_set_ciphersuites SSL_set_ciphersuites OPENSSL_init_crypto DSA_set0_pqg DSA_set0_key RSA_set0_key
+for ac_func in OPENSSL_config EVP_md5 EVP_sha1 EVP_sha224 EVP_sha256 EVP_sha384 EVP_sha512 FIPS_mode ENGINE_load_cryptodev EVP_PKEY_keygen ECDSA_SIG_get0 EVP_MD_CTX_new EVP_PKEY_base_id HMAC_CTX_new HMAC_CTX_free TLS_client_method DSA_SIG_set0 EVP_dss1 EVP_DigestVerify OpenSSL_version_num OpenSSL_version SSL_CTX_dane_enable SSL_dane_enable SSL_dane_tlsa_add X509_check_host X509_get_notAfter X509_get0_notAfter SSL_CTX_set_ciphersuites SSL_set_ciphersuites DSA_set0_pqg DSA_set0_key RSA_set0_key
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"

View File

@ -1,29 +0,0 @@
--- src/ssl_dane/danessl.c.orig 2019-04-19 16:45:15 UTC
+++ src/ssl_dane/danessl.c
@@ -20,7 +20,7 @@
#error "OpenSSL 1.0.0 or higher required"
#endif
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
#define X509_up_ref(x) CRYPTO_add(&((x)->references), 1, CRYPTO_LOCK_X509)
#define X509_STORE_CTX_get0_cert(ctx) ((ctx)->cert)
#define X509_STORE_CTX_get0_untrusted(ctx) ((ctx)->untrusted)
@@ -896,7 +896,7 @@ static int verify_chain(X509_STORE_CTX *
dane->match = top;
X509_up_ref(top);
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
if (X509_check_issued(top, top) != X509_V_OK) {
X509_STORE_CTX_set_error_depth(ctx, dane->depth);
X509_STORE_CTX_set_current_cert(ctx, top);
@@ -1457,7 +1457,7 @@ static void dane_init(void)
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))
{
int wlock = 0;