summaryrefslogtreecommitdiff
path: root/pkg/nsd/patch/0002-Use-timingsafe_memcmp-if-available.patch
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2020-03-20 16:10:00 -0700
committerMichael Forney <mforney@mforney.org>2020-03-20 16:10:00 -0700
commitfa73eed05e35d6fb4f07cb98e2f95efbeafb807d (patch)
tree694de4d6d09cb35bd316d369d298e08d9fc358b9 /pkg/nsd/patch/0002-Use-timingsafe_memcmp-if-available.patch
parente4e6b8fbbfb4451c85622664fcbebed9e4ae7243 (diff)
nsd: Update to 4.3.0
Diffstat (limited to 'pkg/nsd/patch/0002-Use-timingsafe_memcmp-if-available.patch')
-rw-r--r--pkg/nsd/patch/0002-Use-timingsafe_memcmp-if-available.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkg/nsd/patch/0002-Use-timingsafe_memcmp-if-available.patch b/pkg/nsd/patch/0002-Use-timingsafe_memcmp-if-available.patch
index adbd6fe1..fafcf4cc 100644
--- a/pkg/nsd/patch/0002-Use-timingsafe_memcmp-if-available.patch
+++ b/pkg/nsd/patch/0002-Use-timingsafe_memcmp-if-available.patch
@@ -1,4 +1,4 @@
-From 8bb168cfe8640134c5c654fdda91632c6f131aa9 Mon Sep 17 00:00:00 2001
+From a42ca948ea74b976d2186798ed1023d9db44e983 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 if available
@@ -9,12 +9,12 @@ Subject: [PATCH] Use timingsafe_memcmp if available
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 806d8fba..b8e498f3 100644
+index 52e410c2..ce0f5b17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -628,7 +628,7 @@ AC_CHECK_SIZEOF(void*)
AC_CHECK_SIZEOF(off_t)
- AC_CHECK_FUNCS([arc4random arc4random_uniform])
+ AC_CHECK_FUNCS([getrandom arc4random arc4random_uniform])
AC_SEARCH_LIBS([setusercontext],[util],[AC_CHECK_HEADERS([login_cap.h])])
-AC_CHECK_FUNCS([tzset alarm chroot dup2 endpwent gethostname memset memcpy pwrite socket strcasecmp strchr strdup strerror strncasecmp strtol writev getaddrinfo getnameinfo freeaddrinfo gai_strerror sigaction sigprocmask strptime strftime localtime_r setusercontext glob initgroups setresuid setreuid setresgid setregid getpwnam mmap ppoll clock_gettime accept4])
+AC_CHECK_FUNCS([tzset alarm chroot dup2 endpwent gethostname memset memcpy pwrite socket strcasecmp strchr strdup strerror strncasecmp strtol writev getaddrinfo getnameinfo freeaddrinfo gai_strerror sigaction sigprocmask strptime strftime localtime_r setusercontext glob initgroups setresuid setreuid setresgid setregid getpwnam mmap ppoll clock_gettime accept4 timingsafe_memcmp])
@@ -22,7 +22,7 @@ index 806d8fba..b8e498f3 100644
AC_CHECK_TYPE([struct mmsghdr], AC_DEFINE(HAVE_MMSGHDR, 1, [If sys/socket.h has a struct mmsghdr.]), [], [
AC_INCLUDES_DEFAULT
diff --git a/tsig.c b/tsig.c
-index 91ca99b9..8c63ecfa 100644
+index 8b24fd1b..e75aa231 100644
--- a/tsig.c
+++ b/tsig.c
@@ -19,7 +19,9 @@
@@ -37,5 +37,5 @@ index 91ca99b9..8c63ecfa 100644
#define CRYPTO_memcmp memcmp_fixedtime
int memcmp_fixedtime(const void *s1, const void *s2, size_t n)
--
-2.24.0
+2.25.1