Skip to content

Commit

Permalink
Backport setuptools version ban (#11526)
Browse files Browse the repository at this point in the history
* Backport setuptools version ban

* Added shorter intro paragraphs to doc comments for clippy (#11492)
  • Loading branch information
alex authored Sep 3, 2024
1 parent 6687bab commit 0393fef
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ requires = [
"cffi>=1.12; platform_python_implementation != 'PyPy'",
# Needed because cffi imports distutils, and in Python 3.12, distutils has
# been removed from the stdlib, but installing setuptools puts it back.
"setuptools",
"setuptools!=74.0.0,!=74.1.0",
]
build-backend = "maturin"

Expand Down
5 changes: 5 additions & 0 deletions src/rust/cryptography-x509-verification/src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ use asn1::IA5String;
// RFC 2822 3.2.4
static ATEXT_CHARS: &str = "!#$%&'*+-/=?^_`{|}~";

/// Represents a DNS name can be used in X.509 name matching.
///
/// A `DNSName` is an `asn1::IA5String` with additional invariant preservations
/// per [RFC 5280 4.2.1.6], which in turn uses the preferred name syntax defined
/// in [RFC 1034 3.5] and amended in [RFC 1123 2.1].
Expand Down Expand Up @@ -100,6 +102,9 @@ impl PartialEq for DNSName<'_> {
}
}

/// Represents either a DNS name or a DNS wildcard for use in X.509 name
/// matching.
///
/// A `DNSPattern` represents a subset of the domain name wildcard matching
/// behavior defined in [RFC 6125 6.4.3]. In particular, all DNS patterns
/// must either be exact matches (post-normalization) *or* a single wildcard
Expand Down

0 comments on commit 0393fef

Please sign in to comment.