Skip to content

Commit 1d2042a

Browse files
committed
lib: unify CertificateParams impl blocks
1 parent 5980234 commit 1d2042a

File tree

1 file changed

+16
-18
lines changed

1 file changed

+16
-18
lines changed

rcgen/src/lib.rs

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -578,6 +578,22 @@ impl Default for CertificateParams {
578578
}
579579

580580
impl CertificateParams {
581+
/// Generate certificate parameters with reasonable defaults
582+
pub fn new(subject_alt_names: impl Into<Vec<String>>) -> Self {
583+
let subject_alt_names = subject_alt_names
584+
.into()
585+
.into_iter()
586+
.map(|s| match s.parse() {
587+
Ok(ip) => SanType::IpAddress(ip),
588+
Err(_) => SanType::DnsName(s),
589+
})
590+
.collect::<Vec<_>>();
591+
CertificateParams {
592+
subject_alt_names,
593+
..Default::default()
594+
}
595+
}
596+
581597
/// Parses an existing ca certificate from the ASCII PEM format.
582598
///
583599
/// See [`from_ca_cert_der`](Self::from_ca_cert_der) for more details.
@@ -1208,24 +1224,6 @@ pub enum BasicConstraints {
12081224
Constrained(u8),
12091225
}
12101226

1211-
impl CertificateParams {
1212-
/// Generate certificate parameters with reasonable defaults
1213-
pub fn new(subject_alt_names: impl Into<Vec<String>>) -> Self {
1214-
let subject_alt_names = subject_alt_names
1215-
.into()
1216-
.into_iter()
1217-
.map(|s| match s.parse() {
1218-
Ok(ip) => SanType::IpAddress(ip),
1219-
Err(_) => SanType::DnsName(s),
1220-
})
1221-
.collect::<Vec<_>>();
1222-
CertificateParams {
1223-
subject_alt_names,
1224-
..Default::default()
1225-
}
1226-
}
1227-
}
1228-
12291227
/// The [NameConstraints extension](https://tools.ietf.org/html/rfc5280#section-4.2.1.10)
12301228
/// (only relevant for CA certificates)
12311229
#[derive(Debug, PartialEq, Eq, Clone)]

0 commit comments

Comments
 (0)