Skip to content

Commit cc555a8

Browse files
committed
cargo fmt
Signed-off-by: Markus Theil <[email protected]>
1 parent e93ab39 commit cc555a8

File tree

1 file changed

+24
-12
lines changed

1 file changed

+24
-12
lines changed

openssl/src/x509/tests.rs

+24-12
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ use crate::rsa::Rsa;
1212
use crate::ssl::SslFiletype;
1313
use crate::stack::Stack;
1414
use crate::x509::extension::{
15-
AuthorityKeyIdentifier, BasicConstraints, ExtendedKeyUsage, KeyUsage, SubjectAlternativeName,
16-
SubjectKeyIdentifier, SbgpAsIdentifier, SbgpIpAddressIdentifier
15+
AuthorityKeyIdentifier, BasicConstraints, ExtendedKeyUsage, KeyUsage, SbgpAsIdentifier,
16+
SbgpIpAddressIdentifier, SubjectAlternativeName, SubjectKeyIdentifier,
1717
};
18+
use crate::x509::sbgp::ExtractSBGPInfo;
1819
#[cfg(not(boringssl))]
1920
use crate::x509::store::X509Lookup;
2021
use crate::x509::store::X509StoreBuilder;
@@ -29,7 +30,6 @@ use crate::x509::{CrlReason, X509Builder};
2930
use crate::x509::{
3031
CrlStatus, X509Crl, X509Extension, X509Name, X509Req, X509StoreContext, X509VerifyResult, X509,
3132
};
32-
use crate::x509::sbgp::ExtractSBGPInfo;
3333

3434
#[cfg(ossl110)]
3535
use foreign_types::ForeignType;
@@ -1187,16 +1187,19 @@ fn test_sbgp_extensions_parsing() {
11871187
let cert = X509::from_pem(cert).unwrap();
11881188

11891189
let asn_ranges = cert.asn().unwrap().ranges().unwrap();
1190-
assert_eq!(asn_ranges[0], (10,18));
1191-
assert_eq!(asn_ranges[1], (20,20));
1190+
assert_eq!(asn_ranges[0], (10, 18));
1191+
assert_eq!(asn_ranges[1], (20, 20));
11921192

11931193
let families = cert.ip_addresses().unwrap();
11941194
for family in families {
11951195
let ranges = family.range().unwrap();
11961196
for (ip_min, ip_max) in ranges {
11971197
if let (IpAddr::V6(a_v6_min), IpAddr::V6(a_v6_max)) = (ip_min, ip_max) {
11981198
assert_eq!(a_v6_min, Ipv6Addr::from_str("fd00::").unwrap());
1199-
assert_eq!(a_v6_max, Ipv6Addr::from_str("fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff").unwrap());
1199+
assert_eq!(
1200+
a_v6_max,
1201+
Ipv6Addr::from_str("fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff").unwrap()
1202+
);
12001203
}
12011204
if let (IpAddr::V4(a_v4_min), IpAddr::V4(a_v4_max)) = (ip_min, ip_max) {
12021205
assert_eq!(a_v4_min, Ipv4Addr::from_str("10.0.0.0").unwrap());
@@ -1212,14 +1215,23 @@ fn test_sbgp_extensions_builder() {
12121215
let asn_ext = SbgpAsIdentifier::new()
12131216
.critical()
12141217
.add_asn(32)
1215-
.add_asn_range(10,20)
1216-
.build(&builder.x509v3_context(None, None)).unwrap();
1218+
.add_asn_range(10, 20)
1219+
.build(&builder.x509v3_context(None, None))
1220+
.unwrap();
12171221
builder.append_extension(asn_ext).unwrap();
12181222

12191223
let mut ip_addr_ext = SbgpIpAddressIdentifier::new();
12201224
ip_addr_ext.critical();
1221-
ip_addr_ext.add_ipv6_addr_range(Ipv6Addr::from_str("fd00::").unwrap(), Ipv6Addr::from_str("fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff").unwrap());
1222-
ip_addr_ext.add_ipv4_addr_range(Ipv4Addr::from_str("10.0.0.0").unwrap(), Ipv4Addr::from_str("10.0.0.255").unwrap());
1223-
let build_ext = ip_addr_ext.build(&builder.x509v3_context(None, None)).unwrap();
1225+
ip_addr_ext.add_ipv6_addr_range(
1226+
Ipv6Addr::from_str("fd00::").unwrap(),
1227+
Ipv6Addr::from_str("fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff").unwrap(),
1228+
);
1229+
ip_addr_ext.add_ipv4_addr_range(
1230+
Ipv4Addr::from_str("10.0.0.0").unwrap(),
1231+
Ipv4Addr::from_str("10.0.0.255").unwrap(),
1232+
);
1233+
let build_ext = ip_addr_ext
1234+
.build(&builder.x509v3_context(None, None))
1235+
.unwrap();
12241236
builder.append_extension(build_ext).unwrap();
1225-
}
1237+
}

0 commit comments

Comments
 (0)