[src/trunk]: src/external/bsd/bind the decision to use AES_SIT and GOST belon...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ae5608ad88f2
branches:  trunk
changeset: 346155:ae5608ad88f2
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Jun 29 17:52:28 2016 +0000

description:
the decision to use AES_SIT and GOST belongs in the Makefile for MKCRYPT

diffstat:

 external/bsd/bind/Makefile.inc     |  4 ++--
 external/bsd/bind/include/config.h |  6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (41 lines):

diff -r b3602efbb5c4 -r ae5608ad88f2 external/bsd/bind/Makefile.inc
--- a/external/bsd/bind/Makefile.inc    Wed Jun 29 11:16:47 2016 +0000
+++ b/external/bsd/bind/Makefile.inc    Wed Jun 29 17:52:28 2016 +0000
@@ -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 @@
 .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
diff -r b3602efbb5c4 -r ae5608ad88f2 external/bsd/bind/include/config.h
--- a/external/bsd/bind/include/config.h        Wed Jun 29 11:16:47 2016 +0000
+++ b/external/bsd/bind/include/config.h        Wed Jun 29 17:52:28 2016 +0000
@@ -165,7 +165,8 @@
 /* #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 @@
 #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 */