3 July 2023: Wouter

- Fix #906: warning: ‘Py_SetProgramName’ is deprecated.

break;

default : break;

}

}

sldns_buffer_position(strbuf));

}

hex_data_size = (size_t)atoi(token);

*rr_cur_len + hex_data_size > *rr_len) {

return RET_ERR(LDNS_WIREPARSE_ERR_BUFFER_TOO_SMALL,

sldns_buffer_position(strbuf));

/* check if not quoted yet, and we have encountered quotes */

if(!*quoted && sldns_rdf_type_maybe_quoted(rdftype) &&

slen >= 2 &&

(token[slen-1] == '"' || token[slen-1] == '\'')) {

/* move token two smaller (quotes) with endnull */

memmove(token, token+1, slen-2);

mandatory = svcparams[i];

}

if(mandatory) {

/* Divide by sizeof(uint16_t)*/

uint16_t mandatory_nkeys = sldns_read_uint16(mandatory + 2) / sizeof(uint16_t);

token[2]=='\t')) {

was_unknown_rr_format = 1;

if((status=rrinternal_parse_unknown(strbuf, token,

pre_data_pos)) != 0)

return status;

} else if(token_strlen > 0 || quoted) {

if (rr_type == LDNS_RR_TYPE_SVCB || rr_type == LDNS_RR_TYPE_HTTPS) {

size_t rdata_len = rr_cur_len - dname_len - 10;

uint8_t *rdata = rr+dname_len + 10;

/* skip 1st rdata field SvcPriority (uint16_t) */

if (rdata_len < sizeof(uint16_t))

return LDNS_WIREPARSE_ERR_OK;

return key_value;

} else switch (key_len) {

break;

return SVCB_KEY_ALPN;

return SVCB_KEY_PORT;

break;

break;

return SVCB_KEY_IPV4HINT;

return SVCB_KEY_IPV6HINT;

break;

break;

default:

size_t str_len;

size_t dst_len;

size_t val_len;

val_len = strlen(val);

if (val_len > sizeof(unescaped_dst)) {

sldns_write_uint16(rd + 2, dst_len);

memcpy(rd + 4, unescaped_dst, dst_len);

*rd_len = 4 + dst_len;

return LDNS_WIREPARSE_ERR_OK;

}

case SVCB_KEY_PORT:

case SVCB_KEY_IPV4HINT:

case SVCB_KEY_IPV6HINT:

return LDNS_WIREPARSE_ERR_SVCB_MISSING_PARAM;

default:

return sldns_str2wire_svcbparam_ech_value(val, rd, rd_len);

case SVCB_KEY_ALPN:

return sldns_str2wire_svcbparam_alpn_value(val, rd, rd_len);

default:

str_len = strlen(val);

if (*rd_len < 4 + str_len)

/* case: key=value */

if (eq_pos != NULL && eq_pos[1]) {

val_in = eq_pos + 1;

/* unescape characters and "" blocks */

if (*val_in == '"') {

val_in++;

}

*val_out = 0;

}

/* case: key= */

return sldns_str2wire_svcparam_value(str, eq_pos - str, NULL, rd, rd_len);

}

/* case: key */

#define SVCB_KEY_IPV4HINT 4

#define SVCB_KEY_ECH 5

#define SVCB_KEY_IPV6HINT 6

#define MAX_NUMBER_OF_SVCPARAMS 64

#define LDNS_WIREPARSE_ERR_SVCB_NO_DEFAULT_ALPN_VALUE 385

#define LDNS_WIREPARSE_ERR_SVCPARAM_BROKEN_RDATA 386

"Mandatory SvcParamKey is missing"},

{ LDNS_WIREPARSE_ERR_SVCB_MANDATORY_DUPLICATE_KEY,

"Keys in SvcParam mandatory MUST be unique" },

"mandatory MUST not be included as mandatory parameter" },

{ LDNS_WIREPARSE_ERR_SVCB_PORT_VALUE_SYNTAX,

"Could not parse port SvcParamValue" },

const char *svcparamkey_strs[] = {

"mandatory", "alpn", "no-default-alpn", "port",

};

char* sldns_wire2str_pkt(uint8_t* data, size_t len)

uint8_t* rr = *d;

size_t rrlen = *dlen, dname_off, rdlen, ordlen;

uint16_t rrtype = 0;

if(*dlen >= 3 && (*d)[0]==0 &&

sldns_read_uint16((*d)+1)==LDNS_RR_TYPE_OPT) {

/* perform EDNS OPT processing */

w += sldns_str_print(s, slen, "%s", ",");

}

w += sldns_str_print(s, slen, "\"");

return w;

}

(*s) += size;

(*slen) -= size;

return w + size;

}

/* verify that we have data_len data */

if (data_len > *dlen)

written_chars += sldns_print_svcparamkey(s, slen, svcparamkey);

if (!data_len) {

case SVCB_KEY_IPV4HINT:

case SVCB_KEY_IPV6HINT:

case SVCB_KEY_MANDATORY:

return -1;

default:

return written_chars;

case SVCB_KEY_ECH:

r = sldns_wire2str_svcparam_ech2str(s, slen, data_len, *d);

break;

default:

r = sldns_str_print(s, slen, "=\"");

}

if (r <= 0)

return -1; /* wireformat error */

written_chars += r;

*d += data_len;

*dlen -= data_len;

unsigned i, bit, window, block_len;

uint16_t t;

int w = 0;

/* check for errors */

while(pl) {

if(pl < 2) return -1;

@ SOA primary admin 0 0 0 0 0

f21 HTTPS 1 foo.example.com. ech="123"

f21 HTTPS 1 foo.example.com. echconfig="123"

s09 HTTPS 0 . ( alpn="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" )

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"

s09.success-cases. 3600 IN HTTPS 0 . alpn="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"

elif $PRE/readzone svcb.failure-cases-03

then

echo "Incorrectly succeeded"

exit 1

echo "Failure case 04: 256 is too many characters for an alpn; maximum is 255"

echo "Incorrectly succeeded"

exit 1

else

echo "All failure cases test successfully"

fi