Module Name: src
Committed By: christos
Date: Wed Jun 29 17:52:28 UTC 2016
Modified Files:
src/external/bsd/bind: Makefile.inc
src/external/bsd/bind/include: config.h
Log Message:
the decision to use AES_SIT and GOST belongs in the Makefile for MKCRYPT
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/bind/Makefile.inc
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/bind/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/Makefile.inc
diff -u src/external/bsd/bind/Makefile.inc:1.22 src/external/bsd/bind/Makefile.inc:1.23
--- src/external/bsd/bind/Makefile.inc:1.22 Mon Aug 18 00:40:51 2014
+++ src/external/bsd/bind/Makefile.inc Wed Jun 29 13:52:28 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.22 2014/08/18 04:40:51 christos Exp $
+# $NetBSD: Makefile.inc,v 1.23 2016/06/29 17:52:28 christos Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -90,7 +90,7 @@ LIBDPLIBS+= pthread ${NETBSDSRCDIR
.endif
.if ${NAMED_USE_OPENSSL} == "yes"
-CPPFLAGS+=-DOPENSSL -DUSE_ISC_SPNEGO
+CPPFLAGS+=-DOPENSSL -DUSE_ISC_SPNEGO -DHAVE_OPENSSL_GOST -DAES_SIT
.if ${MKKERBEROS} != "no"
CPPFLAGS+=-DGSSAPI
.endif
Index: src/external/bsd/bind/include/config.h
diff -u src/external/bsd/bind/include/config.h:1.19 src/external/bsd/bind/include/config.h:1.20
--- src/external/bsd/bind/include/config.h:1.19 Thu May 26 12:50:01 2016
+++ src/external/bsd/bind/include/config.h Wed Jun 29 13:52:28 2016
@@ -165,7 +165,8 @@ int sigwait(const unsigned int *set, int
/* #undef AC_APPLE_UNIVERSAL_BUILD */
/* Use AES for Source Identity Token generation */
-#define AES_SIT 1
+/* In Makefile */
+/* #undef AES_SIT */
/* Define to enable the "filter-aaaa-on-v4" and "filter-aaaa-on-v6" options.
*/
@@ -369,7 +370,8 @@ int sigwait(const unsigned int *set, int
#define HAVE_OPENSSL_EVP_AES 1
/* Define if your OpenSSL version supports GOST. */
-#define HAVE_OPENSSL_GOST 1
+/* In Makefile */
+/* #undef HAVE_OPENSSL_GOST */
/* Define if your PKCS11 provider supports ECDSA. */
/* #undef HAVE_PKCS11_ECDSA */
