summaryrefslogtreecommitdiff
path: root/external/bsd/bind/include
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2018-04-07 22:23:12 +0000
committerchristos <christos@NetBSD.org>2018-04-07 22:23:12 +0000
commit05ab7921a85b6e0bcddea7a5bfa392b16cb7ef3a (patch)
tree87acf7bed3f6bbd631ef4cdffd53ebf63b7d3328 /external/bsd/bind/include
parent1a10249eaa14189dec693423fd6de0c478b8b356 (diff)
merge 9.7.10
Diffstat (limited to 'external/bsd/bind/include')
-rw-r--r--external/bsd/bind/include/config.h40
-rw-r--r--external/bsd/bind/include/dns/code.h21
-rw-r--r--external/bsd/bind/include/dns/enumclass.h2
-rw-r--r--external/bsd/bind/include/dns/enumtype.h4
-rw-r--r--external/bsd/bind/include/dns/rdatastruct.h38
-rw-r--r--external/bsd/bind/include/isc/platform.h8
6 files changed, 99 insertions, 14 deletions
diff --git a/external/bsd/bind/include/config.h b/external/bsd/bind/include/config.h
index c327aca74f9..9d2809d164a 100644
--- a/external/bsd/bind/include/config.h
+++ b/external/bsd/bind/include/config.h
@@ -17,8 +17,6 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
-/* Id: acconfig.h,v 1.53 2008/12/01 23:47:44 tbox Exp */
-
/*! \file */
/***
@@ -158,9 +156,11 @@ int sigwait(const unsigned int *set, int *sig);
/* Define if building universal (internal helper macro) */
/* #undef AC_APPLE_UNIVERSAL_BUILD */
+#ifndef __NetBSD__
+/* defined by the build process */
/* Use AES for Source Identity Token generation */
-/* In Makefile */
-/* #undef AES_SIT */
+#define AES_SIT 1
+#endif
/* Define to enable the "filter-aaaa-on-v4" and "filter-aaaa-on-v6" options.
*/
@@ -255,9 +255,15 @@ int sigwait(const unsigned int *set, int *sig);
/* Define to 1 if you have the `EVP_sha512' function. */
#define HAVE_EVP_SHA512 1
+/* Define to 1 if you have the `explicit_bzero' function. */
+/* #undef HAVE_EXPLICIT_BZERO */
+
/* Define to 1 if you have the <fcntl.h> header file. */
#define HAVE_FCNTL_H 1
+/* Define if OpenSSL provides FIPS_mode() */
+#define HAVE_FIPS_MODE 1
+
/* Define to 1 if you have the `fseeko' function. */
#define HAVE_FSEEKO 1
@@ -379,27 +385,47 @@ int sigwait(const unsigned int *set, int *sig);
#define HAVE_NET_ROUTE_H 1
/* Define if your OpenSSL version supports AES */
-#define HAVE_OPENSSL_AES 1
+/* #undef HAVE_OPENSSL_AES */
/* Define if your OpenSSL version supports ECDSA. */
#define HAVE_OPENSSL_ECDSA 1
+/* Define if your OpenSSL version supports Ed25519. */
+/* #undef HAVE_OPENSSL_ED25519 */
+
+/* Define if your OpenSSL version supports Ed448. */
+/* #undef HAVE_OPENSSL_ED448 */
+
/* Define if your OpenSSL version supports EVP AES */
#define HAVE_OPENSSL_EVP_AES 1
/* Define if your OpenSSL version supports GOST. */
-/* In Makefile */
/* #undef HAVE_OPENSSL_GOST */
/* Define if your PKCS11 provider supports ECDSA. */
/* #undef HAVE_PKCS11_ECDSA */
+/* Define if your PKCS11 provider supports Ed25519. */
+/* #undef HAVE_PKCS11_ED25519 */
+
+/* Define if your PKCS11 provider supports Ed448. */
+/* #undef HAVE_PKCS11_ED448 */
+
/* Define if your PKCS11 provider supports GOST. */
/* #undef HAVE_PKCS11_GOST */
/* Support for PTHREAD_MUTEX_ADAPTIVE_NP */
/* #undef HAVE_PTHREAD_MUTEX_ADAPTIVE_NP */
+/* Define to 1 if you have the <pthread_np.h> header file. */
+/* #undef HAVE_PTHREAD_NP_H */
+
+/* Define to 1 if you have the `pthread_setname_np' function. */
+#define HAVE_PTHREAD_SETNAME_NP 1
+
+/* Define to 1 if you have the `pthread_set_name_np' function. */
+/* #undef HAVE_PTHREAD_SET_NAME_NP */
+
/* Define to 1 if you have the `pthread_yield' function. */
/* #undef HAVE_PTHREAD_YIELD */
@@ -535,7 +561,7 @@ int sigwait(const unsigned int *set, int *sig);
/* #undef NEED_SECURE_DIRECTORY */
/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "bind9-bugs@isc.org"
+#define PACKAGE_BUGREPORT "info@isc.org"
/* Define to the full name of this package. */
#define PACKAGE_NAME "BIND"
diff --git a/external/bsd/bind/include/dns/code.h b/external/bsd/bind/include/dns/code.h
index 287920cda52..1f3382eddb2 100644
--- a/external/bsd/bind/include/dns/code.h
+++ b/external/bsd/bind/include/dns/code.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2017 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2018 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
@@ -105,6 +105,7 @@
#include "rdata/generic/uri_256.c"
#include "rdata/generic/caa_257.c"
#include "rdata/generic/avc_258.c"
+#include "rdata/generic/doa_259.c"
#include "rdata/generic/ta_32768.c"
#include "rdata/generic/dlv_32769.c"
#include "rdata/generic/keydata_65533.c"
@@ -234,6 +235,7 @@
case 256: result = fromtext_uri(rdclass, type, lexer, origin, options, target, callbacks); break; \
case 257: result = fromtext_caa(rdclass, type, lexer, origin, options, target, callbacks); break; \
case 258: result = fromtext_avc(rdclass, type, lexer, origin, options, target, callbacks); break; \
+ case 259: result = fromtext_doa(rdclass, type, lexer, origin, options, target, callbacks); break; \
case 32768: result = fromtext_ta(rdclass, type, lexer, origin, options, target, callbacks); break; \
case 32769: result = fromtext_dlv(rdclass, type, lexer, origin, options, target, callbacks); break; \
case 65533: result = fromtext_keydata(rdclass, type, lexer, origin, options, target, callbacks); break; \
@@ -363,6 +365,7 @@
case 256: result = totext_uri(rdata, tctx, target); break; \
case 257: result = totext_caa(rdata, tctx, target); break; \
case 258: result = totext_avc(rdata, tctx, target); break; \
+ case 259: result = totext_doa(rdata, tctx, target); break; \
case 32768: result = totext_ta(rdata, tctx, target); break; \
case 32769: result = totext_dlv(rdata, tctx, target); break; \
case 65533: result = totext_keydata(rdata, tctx, target); break; \
@@ -492,6 +495,7 @@
case 256: result = fromwire_uri(rdclass, type, source, dctx, options, target); break; \
case 257: result = fromwire_caa(rdclass, type, source, dctx, options, target); break; \
case 258: result = fromwire_avc(rdclass, type, source, dctx, options, target); break; \
+ case 259: result = fromwire_doa(rdclass, type, source, dctx, options, target); break; \
case 32768: result = fromwire_ta(rdclass, type, source, dctx, options, target); break; \
case 32769: result = fromwire_dlv(rdclass, type, source, dctx, options, target); break; \
case 65533: result = fromwire_keydata(rdclass, type, source, dctx, options, target); break; \
@@ -621,6 +625,7 @@
case 256: result = towire_uri(rdata, cctx, target); break; \
case 257: result = towire_caa(rdata, cctx, target); break; \
case 258: result = towire_avc(rdata, cctx, target); break; \
+ case 259: result = towire_doa(rdata, cctx, target); break; \
case 32768: result = towire_ta(rdata, cctx, target); break; \
case 32769: result = towire_dlv(rdata, cctx, target); break; \
case 65533: result = towire_keydata(rdata, cctx, target); break; \
@@ -750,6 +755,7 @@
case 256: result = compare_uri(rdata1, rdata2); break; \
case 257: result = compare_caa(rdata1, rdata2); break; \
case 258: result = compare_avc(rdata1, rdata2); break; \
+ case 259: result = compare_doa(rdata1, rdata2); break; \
case 32768: result = compare_ta(rdata1, rdata2); break; \
case 32769: result = compare_dlv(rdata1, rdata2); break; \
case 65533: result = compare_keydata(rdata1, rdata2); break; \
@@ -879,6 +885,7 @@
case 256: result = casecompare_uri(rdata1, rdata2); break; \
case 257: result = casecompare_caa(rdata1, rdata2); break; \
case 258: result = casecompare_avc(rdata1, rdata2); break; \
+ case 259: result = casecompare_doa(rdata1, rdata2); break; \
case 32768: result = casecompare_ta(rdata1, rdata2); break; \
case 32769: result = casecompare_dlv(rdata1, rdata2); break; \
case 65533: result = casecompare_keydata(rdata1, rdata2); break; \
@@ -1008,6 +1015,7 @@
case 256: result = fromstruct_uri(rdclass, type, source, target); break; \
case 257: result = fromstruct_caa(rdclass, type, source, target); break; \
case 258: result = fromstruct_avc(rdclass, type, source, target); break; \
+ case 259: result = fromstruct_doa(rdclass, type, source, target); break; \
case 32768: result = fromstruct_ta(rdclass, type, source, target); break; \
case 32769: result = fromstruct_dlv(rdclass, type, source, target); break; \
case 65533: result = fromstruct_keydata(rdclass, type, source, target); break; \
@@ -1137,6 +1145,7 @@
case 256: result = tostruct_uri(rdata, target, mctx); break; \
case 257: result = tostruct_caa(rdata, target, mctx); break; \
case 258: result = tostruct_avc(rdata, target, mctx); break; \
+ case 259: result = tostruct_doa(rdata, target, mctx); break; \
case 32768: result = tostruct_ta(rdata, target, mctx); break; \
case 32769: result = tostruct_dlv(rdata, target, mctx); break; \
case 65533: result = tostruct_keydata(rdata, target, mctx); break; \
@@ -1266,6 +1275,7 @@
case 256: freestruct_uri(source); break; \
case 257: freestruct_caa(source); break; \
case 258: freestruct_avc(source); break; \
+ case 259: freestruct_doa(source); break; \
case 32768: freestruct_ta(source); break; \
case 32769: freestruct_dlv(source); break; \
case 65533: freestruct_keydata(source); break; \
@@ -1395,6 +1405,7 @@
case 256: result = additionaldata_uri(rdata, add, arg); break; \
case 257: result = additionaldata_caa(rdata, add, arg); break; \
case 258: result = additionaldata_avc(rdata, add, arg); break; \
+ case 259: result = additionaldata_doa(rdata, add, arg); break; \
case 32768: result = additionaldata_ta(rdata, add, arg); break; \
case 32769: result = additionaldata_dlv(rdata, add, arg); break; \
case 65533: result = additionaldata_keydata(rdata, add, arg); break; \
@@ -1524,6 +1535,7 @@
case 256: result = digest_uri(rdata, digest, arg); break; \
case 257: result = digest_caa(rdata, digest, arg); break; \
case 258: result = digest_avc(rdata, digest, arg); break; \
+ case 259: result = digest_doa(rdata, digest, arg); break; \
case 32768: result = digest_ta(rdata, digest, arg); break; \
case 32769: result = digest_dlv(rdata, digest, arg); break; \
case 65533: result = digest_keydata(rdata, digest, arg); break; \
@@ -1653,6 +1665,7 @@
case 256: result = checkowner_uri(name, rdclass, type, wildcard); break; \
case 257: result = checkowner_caa(name, rdclass, type, wildcard); break; \
case 258: result = checkowner_avc(name, rdclass, type, wildcard); break; \
+ case 259: result = checkowner_doa(name, rdclass, type, wildcard); break; \
case 32768: result = checkowner_ta(name, rdclass, type, wildcard); break; \
case 32769: result = checkowner_dlv(name, rdclass, type, wildcard); break; \
case 65533: result = checkowner_keydata(name, rdclass, type, wildcard); break; \
@@ -1782,6 +1795,7 @@
case 256: result = checknames_uri(rdata, owner, bad); break; \
case 257: result = checknames_caa(rdata, owner, bad); break; \
case 258: result = checknames_avc(rdata, owner, bad); break; \
+ case 259: result = checknames_doa(rdata, owner, bad); break; \
case 32768: result = checknames_ta(rdata, owner, bad); break; \
case 32769: result = checknames_dlv(rdata, owner, bad); break; \
case 65533: result = checknames_keydata(rdata, owner, bad); break; \
@@ -2022,6 +2036,9 @@
case 166: \
RDATATYPE_COMPARE("caa", 257, _typename, _length, _typep); \
break; \
+ case 7: \
+ RDATATYPE_COMPARE("doa", 259, _typename, _length, _typep); \
+ break; \
}
#define RDATATYPE_ATTRIBUTE_SW \
switch (type) { \
@@ -2108,6 +2125,7 @@
case 256: return (RRTYPE_URI_ATTRIBUTES); \
case 257: return (RRTYPE_CAA_ATTRIBUTES); \
case 258: return (RRTYPE_AVC_ATTRIBUTES); \
+ case 259: return (RRTYPE_DOA_ATTRIBUTES); \
case 32768: return (RRTYPE_TA_ATTRIBUTES); \
case 32769: return (RRTYPE_DLV_ATTRIBUTES); \
case 65533: return (RRTYPE_KEYDATA_ATTRIBUTES); \
@@ -2197,6 +2215,7 @@
case 256: return (str_totext("URI", target)); \
case 257: return (str_totext("CAA", target)); \
case 258: return (str_totext("AVC", target)); \
+ case 259: return (str_totext("DOA", target)); \
case 32768: return (str_totext("TA", target)); \
case 32769: return (str_totext("DLV", target)); \
}
diff --git a/external/bsd/bind/include/dns/enumclass.h b/external/bsd/bind/include/dns/enumclass.h
index 8f2a289ca91..b39bf1468d9 100644
--- a/external/bsd/bind/include/dns/enumclass.h
+++ b/external/bsd/bind/include/dns/enumclass.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2017 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2018 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
diff --git a/external/bsd/bind/include/dns/enumtype.h b/external/bsd/bind/include/dns/enumtype.h
index ba0332e97c8..24b1ef12fda 100644
--- a/external/bsd/bind/include/dns/enumtype.h
+++ b/external/bsd/bind/include/dns/enumtype.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2017 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2018 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
@@ -100,6 +100,7 @@ enum {
dns_rdatatype_uri = 256,
dns_rdatatype_caa = 257,
dns_rdatatype_avc = 258,
+ dns_rdatatype_doa = 259,
dns_rdatatype_ta = 32768,
dns_rdatatype_dlv = 32769,
dns_rdatatype_keydata = 65533,
@@ -182,6 +183,7 @@ enum {
#define dns_rdatatype_uri ((dns_rdatatype_t)dns_rdatatype_uri)
#define dns_rdatatype_caa ((dns_rdatatype_t)dns_rdatatype_caa)
#define dns_rdatatype_avc ((dns_rdatatype_t)dns_rdatatype_avc)
+#define dns_rdatatype_doa ((dns_rdatatype_t)dns_rdatatype_doa)
#define dns_rdatatype_ta ((dns_rdatatype_t)dns_rdatatype_ta)
#define dns_rdatatype_dlv ((dns_rdatatype_t)dns_rdatatype_dlv)
#define dns_rdatatype_keydata ((dns_rdatatype_t)dns_rdatatype_keydata)
diff --git a/external/bsd/bind/include/dns/rdatastruct.h b/external/bsd/bind/include/dns/rdatastruct.h
index 745520102e4..6f08261721a 100644
--- a/external/bsd/bind/include/dns/rdatastruct.h
+++ b/external/bsd/bind/include/dns/rdatastruct.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2017 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2018 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1998-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and distribute this software for any
@@ -2526,7 +2526,7 @@ typedef struct dns_rdata_uri {
#endif /* GENERIC_URI_256_H */
/*
- * Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2014, 2018 Internet Systems Consortium, Inc. ("ISC")
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -2553,7 +2553,7 @@ typedef struct dns_rdata_caa {
unsigned char * tag;
isc_uint8_t tag_len;
unsigned char *value;
- isc_uint8_t value_len;
+ isc_uint16_t value_len;
} dns_rdata_caa_t;
#endif /* GENERIC_CAA_257_H */
@@ -2593,6 +2593,38 @@ typedef struct dns_rdata_avc {
*/
#endif /* GENERIC_AVC_258_H */
/*
+ * Copyright (C) 2017 Internet Systems Consortium, Inc. ("ISC")
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef GENERIC_DOA_259_H
+#define GENERIC_DOA_259_H 1
+
+typedef struct dns_rdata_doa {
+ dns_rdatacommon_t common;
+ isc_mem_t * mctx;
+ unsigned char * mediatype;
+ unsigned char * data;
+ isc_uint32_t enterprise;
+ isc_uint32_t type;
+ isc_uint16_t data_len;
+ isc_uint8_t location;
+ isc_uint8_t mediatype_len;
+} dns_rdata_doa_t;
+
+#endif /* GENERIC_DOA_259_H */
+/*
* Copyright (C) 2015 Internet Systems Consortium, Inc. ("ISC")
*
* Permission to use, copy, modify, and/or distribute this software for any
diff --git a/external/bsd/bind/include/isc/platform.h b/external/bsd/bind/include/isc/platform.h
index d4aa7c166e2..6bb12c33b70 100644
--- a/external/bsd/bind/include/isc/platform.h
+++ b/external/bsd/bind/include/isc/platform.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004-2010, 2013-2016 Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010, 2013-2017 Internet Systems Consortium, Inc. ("ISC")
* Copyright (C) 1999-2003 Internet Software Consortium.
*
* Permission to use, copy, modify, and/or distribute this software for any
@@ -321,6 +321,12 @@
#define ISC_PLATFORM_HAVECMPXCHG 1
/*
+ * If <stdatomic.h> is available on this architecture,
+ * ISC_PLATFORM_HAVESTDATOMIC will be defined.
+ */
+/* #undef ISC_PLATFORM_HAVESTDATOMIC */
+
+/*
* Define if gcc ASM extension is available
*/
#define ISC_PLATFORM_USEGCCASM 1