@@ -12,9 +12,10 @@ use crate::rsa::Rsa;
12
12
use crate :: ssl:: SslFiletype ;
13
13
use crate :: stack:: Stack ;
14
14
use crate :: x509:: extension:: {
15
- AuthorityKeyIdentifier , BasicConstraints , ExtendedKeyUsage , KeyUsage , SubjectAlternativeName ,
16
- SubjectKeyIdentifier , SbgpAsIdentifier , SbgpIpAddressIdentifier
15
+ AuthorityKeyIdentifier , BasicConstraints , ExtendedKeyUsage , KeyUsage , SbgpAsIdentifier ,
16
+ SbgpIpAddressIdentifier , SubjectAlternativeName , SubjectKeyIdentifier ,
17
17
} ;
18
+ use crate :: x509:: sbgp:: ExtractSBGPInfo ;
18
19
#[ cfg( not( boringssl) ) ]
19
20
use crate :: x509:: store:: X509Lookup ;
20
21
use crate :: x509:: store:: X509StoreBuilder ;
@@ -29,7 +30,6 @@ use crate::x509::{CrlReason, X509Builder};
29
30
use crate :: x509:: {
30
31
CrlStatus , X509Crl , X509Extension , X509Name , X509Req , X509StoreContext , X509VerifyResult , X509 ,
31
32
} ;
32
- use crate :: x509:: sbgp:: ExtractSBGPInfo ;
33
33
34
34
#[ cfg( ossl110) ]
35
35
use foreign_types:: ForeignType ;
@@ -1187,16 +1187,19 @@ fn test_sbgp_extensions_parsing() {
1187
1187
let cert = X509 :: from_pem ( cert) . unwrap ( ) ;
1188
1188
1189
1189
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 ) ) ;
1192
1192
1193
1193
let families = cert. ip_addresses ( ) . unwrap ( ) ;
1194
1194
for family in families {
1195
1195
let ranges = family. range ( ) . unwrap ( ) ;
1196
1196
for ( ip_min, ip_max) in ranges {
1197
1197
if let ( IpAddr :: V6 ( a_v6_min) , IpAddr :: V6 ( a_v6_max) ) = ( ip_min, ip_max) {
1198
1198
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
+ ) ;
1200
1203
}
1201
1204
if let ( IpAddr :: V4 ( a_v4_min) , IpAddr :: V4 ( a_v4_max) ) = ( ip_min, ip_max) {
1202
1205
assert_eq ! ( a_v4_min, Ipv4Addr :: from_str( "10.0.0.0" ) . unwrap( ) ) ;
@@ -1212,14 +1215,23 @@ fn test_sbgp_extensions_builder() {
1212
1215
let asn_ext = SbgpAsIdentifier :: new ( )
1213
1216
. critical ( )
1214
1217
. 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 ( ) ;
1217
1221
builder. append_extension ( asn_ext) . unwrap ( ) ;
1218
1222
1219
1223
let mut ip_addr_ext = SbgpIpAddressIdentifier :: new ( ) ;
1220
1224
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 ( ) ;
1224
1236
builder. append_extension ( build_ext) . unwrap ( ) ;
1225
- }
1237
+ }
0 commit comments