diff options
| author | Michael Forney <mforney@mforney.org> | 2018-08-21 15:54:07 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2018-08-26 13:20:01 -0700 |
| commit | 1bb56420e2e44be4ef5356164aef5613aaaaf968 (patch) | |
| tree | 3ef6c335601d04cc8a5759f21ebe47e3618c004f /pkg/nsd/patch | |
| parent | d9c8a3a1347ca45d05c635dfb8f074feb1074c70 (diff) | |
nsd: Update to 4.1.24
Diffstat (limited to 'pkg/nsd/patch')
| -rw-r--r-- | pkg/nsd/patch/0001-Remove-quotes-from-dbfile-in-man-pages.patch | 12 | ||||
| -rw-r--r-- | pkg/nsd/patch/0002-Use-timingsafe_memcmp-instead-of-CRYPTO_memcmp.patch | 26 |
2 files changed, 32 insertions, 6 deletions
diff --git a/pkg/nsd/patch/0001-Remove-quotes-from-dbfile-in-man-pages.patch b/pkg/nsd/patch/0001-Remove-quotes-from-dbfile-in-man-pages.patch index a5d3ab2b..3229c808 100644 --- a/pkg/nsd/patch/0001-Remove-quotes-from-dbfile-in-man-pages.patch +++ b/pkg/nsd/patch/0001-Remove-quotes-from-dbfile-in-man-pages.patch @@ -1,7 +1,7 @@ -From 34b5c8009dc61b80a4c270bf630deae45bb156fe Mon Sep 17 00:00:00 2001 +From 3c881bf9f7c67b36ada5b201e6e860d1e9dac52b Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sat, 14 Oct 2017 01:00:22 -0700 -Subject: [PATCH] Remove quotes from @dbfile@ in man pages +Subject: [PATCH 1/2] Remove quotes from @dbfile@ in man pages --- nsd.8.in | 4 ++-- @@ -31,10 +31,10 @@ index 5e488958..babaa06a 100644 .B NSD database diff --git a/nsd.conf.5.in b/nsd.conf.5.in -index b9ac956b..4f7c9867 100644 +index 74e7c6f8..7825d4f8 100644 --- a/nsd.conf.5.in +++ b/nsd.conf.5.in -@@ -197,7 +197,7 @@ If yes, NSD listens to IPv6 connections. Default yes. +@@ -201,7 +201,7 @@ If yes, NSD listens to IPv6 connections. Default yes. .TP .B database:\fR <filename> By default @@ -43,7 +43,7 @@ index b9ac956b..4f7c9867 100644 is used. The specified file is used to store the compiled zone information. Same as commandline option .BR \-f. -@@ -858,7 +858,7 @@ also function as a resolver or cache. The configuration options that +@@ -876,7 +876,7 @@ also function as a resolver or cache. The configuration options that BIND9 has for the resolver or caching thus have no equivalents for NSD. .SH "FILES" .TP @@ -53,5 +53,5 @@ index b9ac956b..4f7c9867 100644 .B NSD database -- -2.15.1 +2.18.0 diff --git a/pkg/nsd/patch/0002-Use-timingsafe_memcmp-instead-of-CRYPTO_memcmp.patch b/pkg/nsd/patch/0002-Use-timingsafe_memcmp-instead-of-CRYPTO_memcmp.patch new file mode 100644 index 00000000..7b6ef936 --- /dev/null +++ b/pkg/nsd/patch/0002-Use-timingsafe_memcmp-instead-of-CRYPTO_memcmp.patch @@ -0,0 +1,26 @@ +From 6d764efd8875a0f11a65b08677a1900182b0019e Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Tue, 21 Aug 2018 15:52:34 -0700 +Subject: [PATCH 2/2] Use timingsafe_memcmp instead of CRYPTO_memcmp + +We do not build with OpenSSL support, so CRYPTO_memcmp is unavailable. +--- + tsig.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tsig.c b/tsig.c +index b0e40116..ce073ec7 100644 +--- a/tsig.c ++++ b/tsig.c +@@ -475,7 +475,7 @@ tsig_verify(tsig_record_type *tsig) + &tsig->prior_mac_size); + + if (tsig->mac_size != tsig->prior_mac_size +- || CRYPTO_memcmp(tsig->mac_data, ++ || timingsafe_memcmp(tsig->mac_data, + tsig->prior_mac_data, + tsig->mac_size) != 0) + { +-- +2.18.0 + |