diff options
| author | Michael Forney <mforney@mforney.org> | 2019-09-06 13:40:29 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2019-09-20 00:22:23 -0700 |
| commit | d96f51b843531c94cb229d0231814b58e56ddad4 (patch) | |
| tree | 7767bc33f04be9ab04bd304a0d7fb4858adc92e1 /pkg/nsd/patch | |
| parent | 702d18b926c21f5b72ce81777d9f2693affc6b6d (diff) | |
nsd: Update to 4.2.2
Diffstat (limited to 'pkg/nsd/patch')
| -rw-r--r-- | pkg/nsd/patch/0002-Use-timingsafe_memcmp-instead-of-CRYPTO_memcmp.patch | 8 | ||||
| -rw-r--r-- | pkg/nsd/patch/0003-Avoid-pointer-arithmetic-on-void.patch | 8 |
2 files changed, 8 insertions, 8 deletions
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 index 876a20bc..7ed036b4 100644 --- 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 @@ -1,4 +1,4 @@ -From 47aa5ef27e6fb596fe844369328238bbc656e16c Mon Sep 17 00:00:00 2001 +From 8d5f6f5c73c68ec5189ed626d515927cba700a32 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Tue, 21 Aug 2018 15:52:34 -0700 Subject: [PATCH] Use timingsafe_memcmp instead of CRYPTO_memcmp @@ -9,10 +9,10 @@ We do not build with OpenSSL support, so CRYPTO_memcmp is unavailable. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tsig.c b/tsig.c -index b0e40116..ce073ec7 100644 +index a450a8b3..d43ba362 100644 --- a/tsig.c +++ b/tsig.c -@@ -475,7 +475,7 @@ tsig_verify(tsig_record_type *tsig) +@@ -530,7 +530,7 @@ tsig_verify(tsig_record_type *tsig) &tsig->prior_mac_size); if (tsig->mac_size != tsig->prior_mac_size @@ -22,5 +22,5 @@ index b0e40116..ce073ec7 100644 tsig->mac_size) != 0) { -- -2.18.0 +2.23.0 diff --git a/pkg/nsd/patch/0003-Avoid-pointer-arithmetic-on-void.patch b/pkg/nsd/patch/0003-Avoid-pointer-arithmetic-on-void.patch index 9aa7153a..dfd635b6 100644 --- a/pkg/nsd/patch/0003-Avoid-pointer-arithmetic-on-void.patch +++ b/pkg/nsd/patch/0003-Avoid-pointer-arithmetic-on-void.patch @@ -1,4 +1,4 @@ -From 31b2b7afa23a282fb9c960651571802d5779ac6b Mon Sep 17 00:00:00 2001 +From fcfbed8db1c746bd938ac6a548036af95b678341 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sun, 16 Jun 2019 23:17:47 -0700 Subject: [PATCH] Avoid pointer arithmetic on `void *` @@ -162,10 +162,10 @@ index 8d7ee137..3ee98648 100644 /** MAX 2**x exponent of alloced chunks, for 1Mbytes. The smallest * chunk is 16bytes (8preamble+8data), so 0-3 is unused. */ diff --git a/xfrd.c b/xfrd.c -index 48339c54..e90dc4f9 100644 +index 3865747a..89713236 100644 --- a/xfrd.c +++ b/xfrd.c -@@ -2463,7 +2463,7 @@ static void +@@ -2465,7 +2465,7 @@ static void xfrd_process_stat_info_task(xfrd_state_type* xfrd, struct task_list_d* task) { size_t i; @@ -175,5 +175,5 @@ index 48339c54..e90dc4f9 100644 for(i=0; i<xfrd->nsd->child_count; i++) { xfrd->nsd->children[i].query_count += *p++; -- -2.22.0 +2.23.0 |