Moved algorithm enum from sig0 to descriptor.h

- Fixed Knot.files

Knot.files

@@ -76,8 +76,8 @@ src/common/libtap/tap.h
 src/common/libtap/tap_unit.h
 src/common/mempattern.c
 src/common/mempattern.h
-src/common/descriptor_new.c
-src/common/descriptor_new.h
+src/common/descriptor.c
+src/common/descriptor.h
 src/common/lists.h
 src/common/lists.c
 src/common/heap.h

src/common/descriptor.h

@@ -115,24 +115,35 @@ enum knot_rdata_wireformat {
 	KNOT_RDATA_WF_END                =   0,
 };
 
-/*! \brief Constants for DNSSEC algorithm types.
+/*!
+ * \brief DNSSEC Algorithm Numbers
  *
- * Source: http://www.iana.org/assignments/dns-sec-alg-numbers/dns-sec-alg-numbers.xml
+ * http://www.iana.org/assignments/dns-sec-alg-numbers/dns-sec-alg-numbers.xml
  */
-enum knot_dnssec_algorithm
-{
+enum knot_dnssec_algorithm {
+	// 0 reserved
 	KNOT_DNSSEC_ALG_RSAMD5 = 1,
 	KNOT_DNSSEC_ALG_DH = 2,
 	KNOT_DNSSEC_ALG_DSA = 3,
+	// 4 reserved
 	KNOT_DNSSEC_ALG_RSASHA1 = 5,
 	KNOT_DNSSEC_ALG_DSA_NSEC3_SHA1 = 6,
 	KNOT_DNSSEC_ALG_RSASHA1_NSEC3_SHA1 = 7,
 	KNOT_DNSSEC_ALG_RSASHA256 = 8,
+	// 9 reserved
 	KNOT_DNSSEC_ALG_RSASHA512 = 10,
+	// 11 reserved
 	KNOT_DNSSEC_ALG_ECC_GOST = 12,
 	KNOT_DNSSEC_ALG_ECDSAP256SHA256 = 13,
-	KNOT_DNSSEC_ALG_ECDSAP384SHA384 = 14
+	KNOT_DNSSEC_ALG_ECDSAP384SHA384 = 14,
+	// 15-122 unassigned
+	// 123-151 reserved
+	// 252 reserved for indirect keys
+	// 253 private algorithm
+	// 254 private algorithm OID
+	// 255 reserved
 };
+typedef enum knot_dnssec_algorithm knot_dnssec_algorithm_t;
 
 /*! \brief Constants for DNSSEC algorithm types.
  *

src/libknot/rrset.h

@@ -538,6 +538,7 @@ int knot_rrset_rdata_from_wire_one(knot_rrset_t *rrset,
                                    const uint8_t *wire, size_t *pos,
                                    size_t total_size, size_t rdlength);
 
+int knot_rrset_ds_check(const knot_rrset_t *rrset);
 #endif /* _KNOT_RRSET_H_ */
 
 /*! @} */

src/libknot/sign/sig0.h

@@ -18,36 +18,7 @@
 #define _KNOT_SIGN_SIG0_H_
 
 #include "sign/key.h"
-
-/*!
- * \brief DNSSEC Algorithm Numbers
- *
- * http://www.iana.org/assignments/dns-sec-alg-numbers/dns-sec-alg-numbers.xml
- */
-enum knot_dnssec_algorithm {
-	// 0 reserved
-	KNOT_DNSSEC_ALG_RSAMD5 = 1,
-	KNOT_DNSSEC_ALG_DH = 2,
-	KNOT_DNSSEC_ALG_DSA = 3,
-	// 4 reserved
-	KNOT_DNSSEC_ALG_RSASHA1 = 5,
-	KNOT_DNSSEC_ALG_DSA_NSEC3_SHA1 = 6,
-	KNOT_DNSSEC_ALG_RSASHA1_NSEC3_SHA1 = 7,
-	KNOT_DNSSEC_ALG_RSASHA256 = 8,
-	// 9 reserved
-	KNOT_DNSSEC_ALG_RSASHA512 = 10,
-	// 11 reserved
-	KNOT_DNSSEC_ALG_ECC_GOST = 12,
-	KNOT_DNSSEC_ALG_ECDSAP256SHA256 = 13,
-	KNOT_DNSSEC_ALG_ECDSAP384SHA384 = 14,
-	// 15-122 unassigned
-	// 123-151 reserved
-	// 252 reserved for indirect keys
-	// 253 private algorithm
-	// 254 private algorithm OID
-	// 255 reserved
-};
-typedef enum knot_dnssec_algorithm knot_dnssec_algorithm_t;
+#include "common/descriptor.h"
 
 /*!
  * \brief Algorithm state data (internal).