Skip to content

Commit 0393fef

Browse files
authored
Backport setuptools version ban (#11526)
* Backport setuptools version ban * Added shorter intro paragraphs to doc comments for clippy (#11492)
1 parent 6687bab commit 0393fef

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

Diff for: pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ requires = [
88
"cffi>=1.12; platform_python_implementation != 'PyPy'",
99
# Needed because cffi imports distutils, and in Python 3.12, distutils has
1010
# been removed from the stdlib, but installing setuptools puts it back.
11-
"setuptools",
11+
"setuptools!=74.0.0,!=74.1.0",
1212
]
1313
build-backend = "maturin"
1414

Diff for: src/rust/cryptography-x509-verification/src/types.rs

+5
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ use asn1::IA5String;
1010
// RFC 2822 3.2.4
1111
static ATEXT_CHARS: &str = "!#$%&'*+-/=?^_`{|}~";
1212

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

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

0 commit comments

Comments
 (0)