|
|
897ae7 |
diff -ru ldns-1.7.0.orig/dnssec.c ldns-1.7.0/dnssec.c
|
|
|
897ae7 |
--- ldns-1.7.0.orig/dnssec.c 2016-12-20 11:48:22.000000000 +0100
|
|
|
897ae7 |
+++ ldns-1.7.0/dnssec.c 2022-03-04 03:18:52.759678825 +0100
|
|
|
897ae7 |
@@ -375,7 +375,7 @@
|
|
|
897ae7 |
BN_free(Y);
|
|
|
897ae7 |
return NULL;
|
|
|
897ae7 |
}
|
|
|
897ae7 |
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
|
|
|
897ae7 |
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || LIBRESSL_VERSION_NUMBER < 0x3050000fL
|
|
|
897ae7 |
#ifndef S_SPLINT_S
|
|
|
897ae7 |
dsa->p = P;
|
|
|
897ae7 |
dsa->q = Q;
|
|
|
897ae7 |
@@ -461,7 +461,7 @@
|
|
|
897ae7 |
BN_free(modulus);
|
|
|
897ae7 |
return NULL;
|
|
|
897ae7 |
}
|
|
|
897ae7 |
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
|
|
|
897ae7 |
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || LIBRESSL_VERSION_NUMBER < 0x3050000fL
|
|
|
897ae7 |
#ifndef S_SPLINT_S
|
|
|
897ae7 |
rsa->n = modulus;
|
|
|
897ae7 |
rsa->e = exponent;
|
|
|
897ae7 |
diff -ru ldns-1.7.0.orig/host2str.c ldns-1.7.0/host2str.c
|
|
|
897ae7 |
--- ldns-1.7.0.orig/host2str.c 2016-12-20 11:48:22.000000000 +0100
|
|
|
897ae7 |
+++ ldns-1.7.0/host2str.c 2022-03-04 03:18:52.759678825 +0100
|
|
|
897ae7 |
@@ -2040,7 +2040,7 @@
|
|
|
897ae7 |
const BIGNUM *n=NULL, *e=NULL, *d=NULL,
|
|
|
897ae7 |
*p=NULL, *q=NULL, *dmp1=NULL,
|
|
|
897ae7 |
*dmq1=NULL, *iqmp=NULL;
|
|
|
897ae7 |
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
|
|
|
897ae7 |
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || LIBRESSL_VERSION_NUMBER < 0x3050000fL
|
|
|
897ae7 |
n = rsa->n;
|
|
|
897ae7 |
e = rsa->e;
|
|
|
897ae7 |
d = rsa->d;
|
|
|
897ae7 |
@@ -2092,7 +2092,7 @@
|
|
|
897ae7 |
if(1) {
|
|
|
897ae7 |
const BIGNUM *p=NULL, *q=NULL, *g=NULL,
|
|
|
897ae7 |
*priv_key=NULL, *pub_key=NULL;
|
|
|
897ae7 |
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
|
|
|
897ae7 |
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || LIBRESSL_VERSION_NUMBER < 0x3050000fL
|
|
|
897ae7 |
#ifndef S_SPLINT_S
|
|
|
897ae7 |
p = dsa->p;
|
|
|
897ae7 |
q = dsa->q;
|
|
|
897ae7 |
diff -ru ldns-1.7.0.orig/keys.c ldns-1.7.0/keys.c
|
|
|
897ae7 |
--- ldns-1.7.0.orig/keys.c 2016-12-20 11:48:22.000000000 +0100
|
|
|
897ae7 |
+++ ldns-1.7.0/keys.c 2022-03-04 03:18:52.759678825 +0100
|
|
|
897ae7 |
@@ -898,7 +898,7 @@
|
|
|
897ae7 |
}
|
|
|
897ae7 |
#endif /* splint */
|
|
|
897ae7 |
|
|
|
897ae7 |
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
|
|
|
897ae7 |
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || LIBRESSL_VERSION_NUMBER < 0x3050000fL
|
|
|
897ae7 |
# ifndef S_SPLINT_S
|
|
|
897ae7 |
rsa->n = n;
|
|
|
897ae7 |
rsa->e = e;
|
|
|
897ae7 |
@@ -1018,7 +1018,7 @@
|
|
|
897ae7 |
}
|
|
|
897ae7 |
#endif /* splint */
|
|
|
897ae7 |
|
|
|
897ae7 |
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
|
|
|
897ae7 |
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || LIBRESSL_VERSION_NUMBER < 0x3050000fL
|
|
|
897ae7 |
# ifndef S_SPLINT_S
|
|
|
897ae7 |
dsa->p = p;
|
|
|
897ae7 |
dsa->q = q;
|
|
|
897ae7 |
@@ -1713,7 +1713,7 @@
|
|
|
897ae7 |
if (!k) {
|
|
|
897ae7 |
return false;
|
|
|
897ae7 |
}
|
|
|
897ae7 |
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
|
|
|
897ae7 |
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || LIBRESSL_VERSION_NUMBER < 0x3050000fL
|
|
|
897ae7 |
n = k->n;
|
|
|
897ae7 |
e = k->e;
|
|
|
897ae7 |
#else
|
|
|
897ae7 |
Only in ldns-1.7.0: ldns-1.7.0.local.patch
|
|
|
897ae7 |
diff -ru ldns-1.7.0.orig/Makefile.in ldns-1.7.0/Makefile.in
|
|
|
897ae7 |
--- ldns-1.7.0.orig/Makefile.in 2016-12-20 11:48:22.000000000 +0100
|
|
|
897ae7 |
+++ ldns-1.7.0/Makefile.in 2022-03-04 03:19:09.959679170 +0100
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
@@ -148,7 +148,7 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
fi
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
drill/drill: $(DRILL_LOBJS) $(LIB)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
- $(LINK_EXE) $(DRILL_LOBJS) $(LIBS) $(LIBSSL_LIBS) -lldns -o drill/drill
|
|
|
897ae7 |
+ $(LINK_EXE) $(DRILL_LOBJS) $(LIBS) $(LIBSSL_LIBS) -L./lib -lldns -o drill/drill
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
drill/drill.1: $(srcdir)/drill/drill.1.in
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
$(edit) $(srcdir)/drill/drill.1.in > drill/drill.1
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
@@ -179,21 +179,21 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
fi
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
$(EXAMPLE_PROGS):
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
- $(LINK_EXE) $@.lo $(LIBS) -lldns -o $@
|
|
|
897ae7 |
+ $(LINK_EXE) $@.lo $(LIBS) -L./lib -lldns -o $@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
$(TESTNS):
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
- $(LINK_EXE) $(TESTNS_LOBJS) $(LIBS) -lldns -o $(TESTNS)
|
|
|
897ae7 |
+ $(LINK_EXE) $(TESTNS_LOBJS) $(LIBS) -L./lib -lldns -o $(TESTNS)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
$(LDNS_DPA):
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
- $(LINK_EXE) $(LDNS_DPA_LOBJS) $(LIBS) $(LIBPCAP_LIBS) -lldns \
|
|
|
897ae7 |
+ $(LINK_EXE) $(LDNS_DPA_LOBJS) $(LIBS) $(LIBPCAP_LIBS) -L./lib -lldns \
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
-o $(LDNS_DPA)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
$(LDNS_DANE):
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
- $(LINK_EXE) $(LDNS_DANE_LOBJS) $(LIBS) $(LIBSSL_SSL_LIBS) -lldns \
|
|
|
897ae7 |
+ $(LINK_EXE) $(LDNS_DANE_LOBJS) $(LIBS) $(LIBSSL_SSL_LIBS) -L./lib -lldns \
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
-o $(LDNS_DANE)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
$(EX_SSL_PROGS):
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
- $(LINK_EXE) $@.lo $(LIBS) $(LIBSSL_LIBS) -lldns -o $@
|
|
|
897ae7 |
+ $(LINK_EXE) $@.lo $(LIBS) $(LIBSSL_LIBS) -L./lib -lldns -o $@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
examples/ldns-dane.1: $(srcdir)/examples/ldns-dane.1.in
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
$(edit) $(srcdir)/examples/ldns-dane.1.in > examples/ldns-dane.1
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
@@ -228,14 +228,14 @@
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
linktest: $(srcdir)/linktest.c libldns.la
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
$(COMP_LIB) $(LIBSSL_CPPFLAGS) -c $(srcdir)/linktest.c -o linktest.lo
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
- $(LINK_EXE) linktest.lo $(LIBS) $(LIBSSL_LIBS) -lldns -o linktest
|
|
|
897ae7 |
+ $(LINK_EXE) linktest.lo $(LIBS) $(LIBSSL_LIBS) -L./lib -lldns -o linktest
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
lib: libldns.la
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
lib-export-all: libldns.la-export-all
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
libldns.la: $(LDNS_ALL_LOBJS)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
- $(LINK_LIB) $(LIBSSL_LDFLAGS) $(LIBSSL_LIBS) -export-symbols-regex '^(ldns_|b32_[pn]to[pn]|mktime_from_utc|qsort_rr_compare_nsec3)' -o libldns.la $(LDNS_ALL_LOBJS) -rpath $(libdir) $(RUNTIME_PATH)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
+ $(LINK_LIB) $(LIBSSL_LDFLAGS) -export-symbols-regex '^(ldns_|b32_[pn]to[pn]|mktime_from_utc|qsort_rr_compare_nsec3)' -o libldns.la $(LDNS_ALL_LOBJS) $(LIBSSL_LIBS) -rpath $(libdir) $(RUNTIME_PATH)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
libldns.la-export-all: $(LDNS_ALL_LOBJS)
|
|
Lucio Andrés Illanes Albornoz (arab, vxp) |
22b9a1 |
$(LINK_LIB) -o libldns.la $(LDNS_ALL_LOBJS) -rpath $(libdir) $(RUNTIME_PATH)
|