Vendor import of Unbound 1.6.7.vendor/unbound/1.6.7

6 files changed, 6 insertions, 6 deletions

diff --git a/validator/autotrust.c b/validator/autotrust.c
index 5bf815b5ec12..97c3e3cc3691 100644
--- a/validator/autotrust.c
+++ b/validator/autotrust.c
@@ -2154,7 +2154,7 @@ int autr_process_prime(struct module_env* env, struct val_env* ve,
 		verbose(VERB_ALGO, "autotrust: no dnskey rrset");
 		/* no update of query_failed, because then we would have
 		 * to write to disk. But we cannot because we maybe are
-		 * still 'initialising' with DS records, that we cannot write
+		 * still 'initializing' with DS records, that we cannot write
 		 * in the full format (which only contains KSKs). */
 		return 1; /* trust point exists */
 	}
diff --git a/validator/val_nsec3.c b/validator/val_nsec3.c
index 4d978372aaac..e31834a44558 100644
--- a/validator/val_nsec3.c
+++ b/validator/val_nsec3.c
@@ -1037,7 +1037,7 @@ nsec3_do_prove_nameerror(struct module_env* env, struct nsec3_filter* flt,
 				"nsec3 is an insecure delegation");
 		return sec;
 	}
-	log_nametypeclass(VERB_ALGO, "nsec3 namerror: proven ce=", ce.ce,0,0);
+	log_nametypeclass(VERB_ALGO, "nsec3 nameerror: proven ce=", ce.ce,0,0);
 
 	/* At this point, we know that qname does not exist. Now we need 
 	 * to prove that the wildcard does not exist. */
diff --git a/validator/val_secalgo.c b/validator/val_secalgo.c
index e9ec5a5b5879..7f5c5181fd2d 100644
--- a/validator/val_secalgo.c
+++ b/validator/val_secalgo.c
@@ -322,7 +322,7 @@ static int
 setup_ecdsa_sig(unsigned char** sig, unsigned int* len)
 {
         /* convert from two BIGNUMs in the rdata buffer, to ASN notation.
-	 * ASN preable:  30440220 <R 32bytefor256> 0220 <S 32bytefor256>
+	 * ASN preamble: 30440220 <R 32bytefor256> 0220 <S 32bytefor256>
 	 * the '20' is the length of that field (=bnsize).
 i	 * the '44' is the total remaining length.
 	 * if negative, start with leading zero.
diff --git a/validator/val_sigcrypt.c b/validator/val_sigcrypt.c
index 25278a8f3ac0..099e658a3d2b 100644
--- a/validator/val_sigcrypt.c
+++ b/validator/val_sigcrypt.c
@@ -906,7 +906,7 @@ canonical_sort(struct ub_packed_rrset_key* rrset, struct packed_rrset_data* d,
 }
 
 /**
- * Inser canonical owner name into buffer.
+ * Insert canonical owner name into buffer.
  * @param buf: buffer to insert into at current position.
  * @param k: rrset with its owner name.
  * @param sig: signature with signer name and label count.
diff --git a/validator/val_utils.h b/validator/val_utils.h
index 649adc2d6559..a837bb8912ba 100644
--- a/validator/val_utils.h
+++ b/validator/val_utils.h
@@ -70,7 +70,7 @@ enum val_classification {
 	/** A NXDOMAIN response. */
 	VAL_CLASS_NAMEERROR,
 	/** A CNAME/DNAME chain, and the offset is at the end of it,
-	 * but there is no answer here, it can be NAMERROR or NODATA. */
+	 * but there is no answer here, it can be NAMEERROR or NODATA. */
 	VAL_CLASS_CNAMENOANSWER,
 	/** A referral, from cache with a nonRD query. */
 	VAL_CLASS_REFERRAL,
diff --git a/validator/validator.c b/validator/validator.c
index 5f4a1eb4ebed..111cbe140353 100644
--- a/validator/validator.c
+++ b/validator/validator.c
@@ -1289,7 +1289,7 @@ validate_cname_noanswer_response(struct module_env* env, struct val_env* ve,
 	uint8_t* ce = NULL; /* for wildcard nodata responses. This is the 
 				proven closest encloser. */
 	uint8_t* wc = NULL; /* for wildcard nodata responses. wildcard nsec */
-	int nxdomain_valid_nsec = 0; /* if true, namerror has been proven */
+	int nxdomain_valid_nsec = 0; /* if true, nameerror has been proven */
 	int nxdomain_valid_wnsec = 0;
 	int nsec3s_seen = 0; /* nsec3s seen */
 	struct ub_packed_rrset_key* s;