Original val_secalgo files + symbol mapping

src/Makefile.in

@@ -48,7 +48,7 @@ srcdir = @srcdir@
 LIBTOOL = ../libtool
 
 CC=@CC@
-CFLAGS=-I$(srcdir) -I. @CFLAGS@ @CPPFLAGS@ $(XTRA_CFLAGS)
+CFLAGS=-I$(srcdir) -I. -I$(srcdir)/util/ub_reroute @CFLAGS@ @CPPFLAGS@ $(XTRA_CFLAGS)
 WPEDANTICFLAG=@WPEDANTICFLAG@
 WNOERRORFLAG=@WNOERRORFLAG@
 LDFLAGS=@LDFLAGS@ @LIBS@

src/util/ub/val_secalgo.h

@@ -0,0 +1,107 @@
+/*
+ * validator/val_secalgo.h - validator security algorithm functions.
+ *
+ * Copyright (c) 2012, NLnet Labs. All rights reserved.
+ *
+ * This software is open source.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 
+ * Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * 
+ * Neither the name of the NLNET LABS nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * \file
+ *
+ * This file contains helper functions for the validator module.
+ * The functions take buffers with raw data and convert to library calls.
+ */
+
+#ifndef VALIDATOR_VAL_SECALGO_H
+#define VALIDATOR_VAL_SECALGO_H
+struct sldns_buffer;
+
+/** Return size of nsec3 hash algorithm, 0 if not supported */
+size_t nsec3_hash_algo_size_supported(int id);
+
+/**
+ * Hash a single hash call of an NSEC3 hash algorithm.
+ * Iterations and salt are done by the caller.
+ * @param algo: nsec3 hash algorithm.
+ * @param buf: the buffer to digest
+ * @param len: length of buffer to digest.
+ * @param res: result stored here (must have sufficient space).
+ * @return false on failure.
+*/
+int secalgo_nsec3_hash(int algo, unsigned char* buf, size_t len,
+        unsigned char* res);
+
+/**
+ * Calculate the sha256 hash for the data buffer into the result.
+ * @param buf: buffer to digest.
+ * @param len: length of the buffer to digest.
+ * @param res: result is stored here (space 256/8 bytes).
+ */
+void secalgo_hash_sha256(unsigned char* buf, size_t len, unsigned char* res);
+
+/**
+ * Return size of DS digest according to its hash algorithm.
+ * @param algo: DS digest algo.
+ * @return size in bytes of digest, or 0 if not supported. 
+ */
+size_t ds_digest_size_supported(int algo);
+
+/**
+ * @param algo: the DS digest algo
+ * @param buf: the buffer to digest
+ * @param len: length of buffer to digest.
+ * @param res: result stored here (must have sufficient space).
+ * @return false on failure.
+ */
+int secalgo_ds_digest(int algo, unsigned char* buf, size_t len,
+	unsigned char* res);
+
+/** return true if DNSKEY algorithm id is supported */
+int dnskey_algo_id_is_supported(int id);
+
+/**
+ * Check a canonical sig+rrset and signature against a dnskey
+ * @param buf: buffer with data to verify, the first rrsig part and the
+ *	canonicalized rrset.
+ * @param algo: DNSKEY algorithm.
+ * @param sigblock: signature rdata field from RRSIG
+ * @param sigblock_len: length of sigblock data.
+ * @param key: public key data from DNSKEY RR.
+ * @param keylen: length of keydata.
+ * @param reason: bogus reason in more detail.
+ * @return secure if verification succeeded, bogus on crypto failure,
+ *	unchecked on format errors and alloc failures.
+ */
+enum sec_status verify_canonrrset(struct sldns_buffer* buf, int algo,
+	unsigned char* sigblock, unsigned int sigblock_len,
+	unsigned char* key, unsigned int keylen, char** reason);
+
+#endif /* VALIDATOR_VAL_SECALGO_H */

src/util/ub_reroute/sldns/keyraw.h

@@ -0,0 +1 @@
+#include "gldns/keyraw.h"

src/util/ub_reroute/sldns/rrdef.h

@@ -0,0 +1 @@
+#include "gldns/rrdef.h"

src/util/ub_reroute/sldns/sbuffer.h

@@ -0,0 +1 @@
+#include "gldns/gbuffer.h"

src/util/ub_reroute/util/data/packed_rrset.h

@@ -0,0 +1 @@
+

src/util/ub_reroute/validator/val_nsec3.h

@@ -0,0 +1 @@
+

src/util/ub_reroute/validator/val_secalgo.h

@@ -0,0 +1 @@
+#include "util/val_secalgo.h"

src/util/val_secalgo.h

@@ -1,107 +1,78 @@
+/**
+ *
+ * \file rbtree.h
+ * /brief Alternative symbol names for unbound's rbtree.h
+ *
+ */
 /*
- * validator/val_secalgo.h - validator security algorithm functions.
+ * Copyright (c) 2017, NLnet Labs, the getdns team
- *
+ * All rights reserved.
- * Copyright (c) 2012, NLnet Labs. All rights reserved.
- *
- * This software is open source.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
+ * modification, are permitted provided that the following conditions are met:
- * are met:
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * * Neither the names of the copyright holders nor the
+ *   names of its contributors may be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
  *
- * Redistributions of source code must retain the above copyright notice,
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * this list of conditions and the following disclaimer.
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * 
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * Redistributions in binary form must reproduce the above copyright notice,
+ * DISCLAIMED. IN NO EVENT SHALL Verisign, Inc. BE LIABLE FOR ANY
- * this list of conditions and the following disclaimer in the documentation
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * and/or other materials provided with the distribution.
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * 
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * Neither the name of the NLNET LABS nor the names of its contributors may
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * be used to endorse or promote products derived from this software without
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * specific prior written permission.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+#ifndef VAL_SECALGO_H_SYMBOLS
+#define VAL_SECALGO_H_SYMBOLS
+#define sldns_buffer			gldns_buffer
+#define nsec3_hash_algo_size_supported	_getdns_nsec3_hash_algo_size_supported
+#define secalgo_nsec3_hash		_getdns_secalgo_nsec3_hash
+#define secalgo_hash_sha256		_getdns_secalgo_hash_sha256
+#define ds_digest_size_supported	_getdns_ds_digest_size_supported
+#define secalgo_ds_digest		_getdns_secalgo_ds_digest
+#define dnskey_algo_id_is_supported	_getdns_dnskey_algo_id_is_supported
+#define verify_canonrrset		_getdns_verify_canonrrset
+#define sec_status			_getdns_sec_status
+#define sec_status_secure		_getdns_sec_status_secure
+#define sec_status_insecure		_getdns_sec_status_insecure
+#define sec_status_unchecked		_getdns_sec_status_unchecked
+#define sec_status_bogus		_getdns_sec_status_bogus
 
-/**
+enum sec_status { sec_status_bogus     = 0
- * \file
+                , sec_status_unchecked = 0
- *
+                , sec_status_insecure  = 0
- * This file contains helper functions for the validator module.
+		, sec_status_secure    = 1 };
- * The functions take buffers with raw data and convert to library calls.
+#define NSEC3_HASH_SHA1			0x01
- */
 
-#ifndef VALIDATOR_VAL_SECALGO_H
+#define	LDNS_SHA1			GLDNS_SHA1
-#define VALIDATOR_VAL_SECALGO_H
+#define	LDNS_SHA256			GLDNS_SHA256
-struct gldns_buffer;
+#define LDNS_SHA384			GLDNS_SHA384
-
+#define LDNS_HASH_GOST			GLDNS_HASH_GOST
-/** Return size of nsec3 hash algorithm, 0 if not supported */
+#define LDNS_RSAMD5			GLDNS_RSAMD5
-size_t _getdns_nsec3_hash_algo_size_supported(int id);
+#define LDNS_DSA			GLDNS_DSA
-
+#define LDNS_DSA_NSEC3			GLDNS_DSA_NSEC3
-/**
+#define LDNS_RSASHA1			GLDNS_RSASHA1
- * Hash a single hash call of an NSEC3 hash algorithm.
+#define LDNS_RSASHA1_NSEC3		GLDNS_RSASHA1_NSEC3
- * Iterations and salt are done by the caller.
+#define LDNS_RSASHA256			GLDNS_RSASHA256
- * @param algo: nsec3 hash algorithm.
+#define LDNS_RSASHA512			GLDNS_RSASHA512
- * @param buf: the buffer to digest
+#define LDNS_ECDSAP256SHA256		GLDNS_ECDSAP256SHA256
- * @param len: length of buffer to digest.
+#define LDNS_ECDSAP384SHA384		GLDNS_ECDSAP384SHA384
- * @param res: result stored here (must have sufficient space).
+#define LDNS_ECC_GOST			GLDNS_ECC_GOST
- * @return false on failure.
+#define sldns_key_EVP_load_gost_id	gldns_key_EVP_load_gost_id
-*/
+#define sldns_digest_evp		gldns_digest_evp
-int _getdns_secalgo_nsec3_hash(int algo, unsigned char* buf, size_t len,
+#define sldns_key_buf2dsa_raw		gldns_key_buf2dsa_raw
-        unsigned char* res);
+#define sldns_key_buf2rsa_raw		gldns_key_buf2rsa_raw
-
+#define sldns_gost2pkey_raw		gldns_gost2pkey_raw
-/**
+#define sldns_ecdsa2pkey_raw		gldns_ecdsa2pkey_raw
- * Calculate the sha256 hash for the data buffer into the result.
+#define sldns_buffer_begin		gldns_buffer_begin
- * @param buf: buffer to digest.
+#define sldns_buffer_limit		gldns_buffer_limit
- * @param len: length of the buffer to digest.
+#include "util/ub/val_secalgo.h"
- * @param res: result is stored here (space 256/8 bytes).
+#endif
- */
-void _getdns_secalgo_hash_sha256(unsigned char* buf, size_t len, unsigned char* res);
-
-/**
- * Return size of DS digest according to its hash algorithm.
- * @param algo: DS digest algo.
- * @return size in bytes of digest, or 0 if not supported. 
- */
-size_t _getdns_ds_digest_size_supported(int algo);
-
-/**
- * @param algo: the DS digest algo
- * @param buf: the buffer to digest
- * @param len: length of buffer to digest.
- * @param res: result stored here (must have sufficient space).
- * @return false on failure.
- */
-int _getdns_secalgo_ds_digest(int algo, unsigned char* buf, size_t len,
-	unsigned char* res);
-
-/** return true if DNSKEY algorithm id is supported */
-int _getdns_dnskey_algo_id_is_supported(int id);
-
-/**
- * Check a canonical sig+rrset and signature against a dnskey
- * @param buf: buffer with data to verify, the first rrsig part and the
- *	canonicalized rrset.
- * @param algo: DNSKEY algorithm.
- * @param sigblock: signature rdata field from RRSIG
- * @param sigblock_len: length of sigblock data.
- * @param key: public key data from DNSKEY RR.
- * @param keylen: length of keydata.
- * @param reason: bogus reason in more detail.
- * @return secure if verification succeeded, bogus on crypto failure,
- *	unchecked on format errors and alloc failures.
- */
-int _getdns_verify_canonrrset(struct gldns_buffer* buf, int algo,
-	unsigned char* sigblock, unsigned int sigblock_len,
-	unsigned char* key, unsigned int keylen, char** reason);
-
-#endif /* VALIDATOR_VAL_SECALGO_H */