change test and error to be in line with new maximum svcb params (nparams >= MAX_NUMBER_OF_SVCPARAMS)

sldns/wire2str.c

@@ -154,7 +154,7 @@ static sldns_lookup_table sldns_wireparse_errors_data[] = {
 	{ LDNS_WIREPARSE_ERR_SVCB_DUPLICATE_KEYS, "Duplicate SVCB key found"},
 	{ LDNS_WIREPARSE_ERR_SVCB_MANDATORY_TOO_MANY_KEYS, "Too many keys in mandatory" },
 	{ LDNS_WIREPARSE_ERR_SVCB_TOO_MANY_PARAMS,
-		"Too many SvcParams. Unbound only allows 64 entries" },
+		"Too many SvcParams. Unbound only allows 63 entries" },
 	{ LDNS_WIREPARSE_ERR_SVCB_MANDATORY_MISSING_PARAM,
 		"Mandatory SvcParamKey is missing"},
 	{ LDNS_WIREPARSE_ERR_SVCB_MANDATORY_DUPLICATE_KEY,

testdata/svcb.tdir/svcb.success-cases.zone

@@ -38,9 +38,9 @@ s06     HTTPS   0 . ech="aGVsbG93b3JsZCE="
 ; echconfig is an alias for ech
 s07     HTTPS   0 . echconfig="aGVsbG93b3JsZCE="
 
-; maximum size allowed in a svcb rdata set (64 SvcParams)
+; maximum size allowed in a svcb rdata set (63 SvcParams)
 
-s08     HTTPS   0 . ( key11=a key12=a key13=a key14=a key15=a key16=a key17=a key18=a key19=a key110=a key111=a key112=a key113=a key114=a key115=a key116=a key117=a key118=a key119=a key120=a key121=a key122=a key123=a key124=a key125=a key126=a key127=a key128=a key129=a key130=a key131=a key132=a key133=a key134=a key135=a key136=a key137=a key138=a key139=a key140=a key141=a key142=a key143=a key144=a key145=a key146=a key147=a key148=a key149=a key150=a key151=a key152=a key153=a key154=a key155=a key156=a key157=a key158=a key159=a key160=a key161=a key162=a key163=a key164=a)
+s08     HTTPS   0 . ( key11=a key12=a key13=a key14=a key15=a key16=a key17=a key18=a key19=a key110=a key111=a key112=a key113=a key114=a key115=a key116=a key117=a key118=a key119=a key120=a key121=a key122=a key123=a key124=a key125=a key126=a key127=a key128=a key129=a key130=a key131=a key132=a key133=a key134=a key135=a key136=a key137=a key138=a key139=a key140=a key141=a key142=a key143=a key144=a key145=a key146=a key147=a key148=a key149=a key150=a key151=a key152=a key153=a key154=a key155=a key156=a key157=a key158=a key159=a key160=a key161=a key162=a key163=a)
 
 ; maximum alpn size allowed (255 characters)
 

testdata/svcb.tdir/svcb.success-cases.zone.cmp

@@ -6,5 +6,5 @@ s04.success-cases.	3600	IN	HTTPS	0 . no-default-alpn
 s05.success-cases.	3600	IN	HTTPS	0 . mandatory=port alpn="dot" no-default-alpn port=853
 s06.success-cases.	3600	IN	HTTPS	0 . ech="aGVsbG93b3JsZCE="
 s07.success-cases.	3600	IN	HTTPS	0 . ech="aGVsbG93b3JsZCE="
-s08.success-cases.	3600	IN	HTTPS	0 . key11="a" key12="a" key13="a" key14="a" key15="a" key16="a" key17="a" key18="a" key19="a" key110="a" key111="a" key112="a" key113="a" key114="a" key115="a" key116="a" key117="a" key118="a" key119="a" key120="a" key121="a" key122="a" key123="a" key124="a" key125="a" key126="a" key127="a" key128="a" key129="a" key130="a" key131="a" key132="a" key133="a" key134="a" key135="a" key136="a" key137="a" key138="a" key139="a" key140="a" key141="a" key142="a" key143="a" key144="a" key145="a" key146="a" key147="a" key148="a" key149="a" key150="a" key151="a" key152="a" key153="a" key154="a" key155="a" key156="a" key157="a" key158="a" key159="a" key160="a" key161="a" key162="a" key163="a" key164="a"
+s08.success-cases.	3600	IN	HTTPS	0 . key11="a" key12="a" key13="a" key14="a" key15="a" key16="a" key17="a" key18="a" key19="a" key110="a" key111="a" key112="a" key113="a" key114="a" key115="a" key116="a" key117="a" key118="a" key119="a" key120="a" key121="a" key122="a" key123="a" key124="a" key125="a" key126="a" key127="a" key128="a" key129="a" key130="a" key131="a" key132="a" key133="a" key134="a" key135="a" key136="a" key137="a" key138="a" key139="a" key140="a" key141="a" key142="a" key143="a" key144="a" key145="a" key146="a" key147="a" key148="a" key149="a" key150="a" key151="a" key152="a" key153="a" key154="a" key155="a" key156="a" key157="a" key158="a" key159="a" key160="a" key161="a" key162="a" key163="a"
 s09.success-cases.	3600	IN	HTTPS	0 . alpn="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"

testdata/svcb.tdir/svcb.test

@@ -54,25 +54,25 @@ fi
 # check all the failure cases
 if $PRE/readzone svcb.failure-cases-01
 then
-	echo "Failure case 21: ech value is not base64 encoded"
+	echo "Failure case 01: ech value is not base64 encoded"
 	echo "Incorrectly succeeded"
 	exit 1
 
 elif $PRE/readzone svcb.failure-cases-02
 then
-	echo "Failure case 22: port value needs to be a positive integer < 65536"
+	echo "Failure case 02: port value needs to be a positive integer < 65536"
 	echo "Incorrectly succeeded"
 	exit 1
 
 elif $PRE/readzone svcb.failure-cases-03
 then
-	echo "Failure case 23: 65 SvcParams is too many SvcParams; the limit is 64"
+	echo "Failure case 02: 65 SvcParams is too many SvcParams; the limit is 64"
 	echo "Incorrectly succeeded"
 	exit 1
 
 elif $PRE/readzone svcb.failure-cases-04
 then
-	echo "Failure case 24: 256 is too many characters for an alpn; maximum is 255"
+	echo "Failure case 04: 256 is too many characters for an alpn; maximum is 255"
 	echo "Incorrectly succeeded"
 	exit 1
 else