@@ -98,7 +98,7 @@ impl<'a> DnsNameRef<'a> {
98
98
if !is_valid_dns_id (
99
99
untrusted:: Input :: from ( dns_name) ,
100
100
IdRole :: Reference ,
101
- AllowWildcards :: No ,
101
+ Wildcards :: Deny ,
102
102
) {
103
103
return Err ( InvalidDnsNameError ) ;
104
104
}
@@ -167,7 +167,7 @@ impl<'a> WildcardDnsNameRef<'a> {
167
167
if !is_valid_dns_id (
168
168
untrusted:: Input :: from ( dns_name) ,
169
169
IdRole :: Reference ,
170
- AllowWildcards :: Yes ,
170
+ Wildcards :: Allow ,
171
171
) {
172
172
return Err ( InvalidDnsNameError ) ;
173
173
}
@@ -371,11 +371,11 @@ fn presented_id_matches_reference_id_internal(
371
371
reference_dns_id_role : IdRole ,
372
372
reference_dns_id : untrusted:: Input ,
373
373
) -> Result < bool , Error > {
374
- if !is_valid_dns_id ( presented_dns_id, IdRole :: Presented , AllowWildcards :: Yes ) {
374
+ if !is_valid_dns_id ( presented_dns_id, IdRole :: Presented , Wildcards :: Allow ) {
375
375
return Err ( Error :: MalformedDnsIdentifier ) ;
376
376
}
377
377
378
- if !is_valid_dns_id ( reference_dns_id, reference_dns_id_role, AllowWildcards :: No ) {
378
+ if !is_valid_dns_id ( reference_dns_id, reference_dns_id_role, Wildcards :: Deny ) {
379
379
return Err ( match reference_dns_id_role {
380
380
IdRole :: NameConstraint => Error :: MalformedNameConstraint ,
381
381
_ => Error :: MalformedDnsIdentifier ,
@@ -506,9 +506,9 @@ fn ascii_lower(b: u8) -> u8 {
506
506
}
507
507
508
508
#[ derive( Clone , Copy , PartialEq ) ]
509
- enum AllowWildcards {
510
- No ,
511
- Yes ,
509
+ enum Wildcards {
510
+ Deny ,
511
+ Allow ,
512
512
}
513
513
514
514
#[ derive( Clone , Copy , PartialEq ) ]
@@ -531,7 +531,7 @@ enum IdRole {
531
531
fn is_valid_dns_id (
532
532
hostname : untrusted:: Input ,
533
533
id_role : IdRole ,
534
- allow_wildcards : AllowWildcards ,
534
+ allow_wildcards : Wildcards ,
535
535
) -> bool {
536
536
// https://blogs.msdn.microsoft.com/oldnewthing/20120412-00/?p=7873/
537
537
if hostname. len ( ) > 253 {
@@ -552,7 +552,7 @@ fn is_valid_dns_id(
552
552
// Only presented IDs are allowed to have wildcard labels. And, like
553
553
// Chromium, be stricter than RFC 6125 requires by insisting that a
554
554
// wildcard label consist only of '*'.
555
- let is_wildcard = allow_wildcards == AllowWildcards :: Yes && input. peek ( b'*' ) ;
555
+ let is_wildcard = allow_wildcards == Wildcards :: Allow && input. peek ( b'*' ) ;
556
556
let mut is_first_byte = !is_wildcard;
557
557
if is_wildcard {
558
558
if input. read_byte ( ) != Ok ( b'*' ) || input. read_byte ( ) != Ok ( b'.' ) {
0 commit comments