Skip to content

Commit d0522c0

Browse files
djccpu
authored andcommitted
Refactor faux-bool enum definition for AllowWildcards
1 parent 7aa0f8d commit d0522c0

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

src/subject_name/dns_name.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ impl<'a> DnsNameRef<'a> {
9898
if !is_valid_dns_id(
9999
untrusted::Input::from(dns_name),
100100
IdRole::Reference,
101-
AllowWildcards::No,
101+
Wildcards::Deny,
102102
) {
103103
return Err(InvalidDnsNameError);
104104
}
@@ -167,7 +167,7 @@ impl<'a> WildcardDnsNameRef<'a> {
167167
if !is_valid_dns_id(
168168
untrusted::Input::from(dns_name),
169169
IdRole::Reference,
170-
AllowWildcards::Yes,
170+
Wildcards::Allow,
171171
) {
172172
return Err(InvalidDnsNameError);
173173
}
@@ -371,11 +371,11 @@ fn presented_id_matches_reference_id_internal(
371371
reference_dns_id_role: IdRole,
372372
reference_dns_id: untrusted::Input,
373373
) -> 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) {
375375
return Err(Error::MalformedDnsIdentifier);
376376
}
377377

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) {
379379
return Err(match reference_dns_id_role {
380380
IdRole::NameConstraint => Error::MalformedNameConstraint,
381381
_ => Error::MalformedDnsIdentifier,
@@ -506,9 +506,9 @@ fn ascii_lower(b: u8) -> u8 {
506506
}
507507

508508
#[derive(Clone, Copy, PartialEq)]
509-
enum AllowWildcards {
510-
No,
511-
Yes,
509+
enum Wildcards {
510+
Deny,
511+
Allow,
512512
}
513513

514514
#[derive(Clone, Copy, PartialEq)]
@@ -531,7 +531,7 @@ enum IdRole {
531531
fn is_valid_dns_id(
532532
hostname: untrusted::Input,
533533
id_role: IdRole,
534-
allow_wildcards: AllowWildcards,
534+
allow_wildcards: Wildcards,
535535
) -> bool {
536536
// https://blogs.msdn.microsoft.com/oldnewthing/20120412-00/?p=7873/
537537
if hostname.len() > 253 {
@@ -552,7 +552,7 @@ fn is_valid_dns_id(
552552
// Only presented IDs are allowed to have wildcard labels. And, like
553553
// Chromium, be stricter than RFC 6125 requires by insisting that a
554554
// 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'*');
556556
let mut is_first_byte = !is_wildcard;
557557
if is_wildcard {
558558
if input.read_byte() != Ok(b'*') || input.read_byte() != Ok(b'.') {

0 commit comments

Comments
 (0)