@@ -7,36 +7,29 @@ if (!common.hasCrypto)
77const assert = require ( 'assert' ) ;
88const tls = require ( 'tls' ) ;
99const { X509Certificate } = require ( 'crypto' ) ;
10+ const tlsCommon = require ( '../common/tls' ) ;
1011
1112const expectedPems = tls . getCACertificates ( { type : 'default' , format : 'pem' } ) ;
1213
1314{
1415 const certs = tls . getCACertificates ( { type : 'default' , format : 'x509' } ) ;
1516 assert . strictEqual ( certs . length , expectedPems . length ) ;
1617
17- for ( let i = 0 ; i < certs . length ; i ++ ) {
18- const cert = certs [ i ] ;
19- const expected = new X509Certificate ( expectedPems [ i ] ) ;
18+ const certsRaw = certs . map ( ( c ) => c . raw ) ;
19+ tlsCommon . assertEqualCerts ( certsRaw , expectedPems ) ;
2020
21+ for ( const cert of certs ) {
2122 assert . ok ( cert instanceof X509Certificate ) ;
22-
23- assert . strictEqual ( cert . fingerprint , expected . fingerprint ) ;
24- assert . strictEqual ( cert . serialNumber , expected . serialNumber ) ;
25- assert . strictEqual ( cert . subject , expected . subject ) ;
26- assert . strictEqual ( cert . raw . toString ( 'hex' ) , expected . raw . toString ( 'hex' ) ) ;
2723 }
2824}
2925
3026{
3127 const certs = tls . getCACertificates ( { type : 'default' , format : 'buffer' } ) ;
3228 assert . strictEqual ( certs . length , expectedPems . length ) ;
29+ tlsCommon . assertEqualCerts ( certs , expectedPems ) ;
3330
34- for ( let i = 0 ; i < certs . length ; i ++ ) {
35- const cert = certs [ i ] ;
36- const expected = new X509Certificate ( expectedPems [ i ] ) ;
37-
31+ for ( const cert of certs ) {
3832 assert . ok ( Buffer . isBuffer ( cert ) ) ;
39- assert . strictEqual ( cert . toString ( 'hex' ) , expected . raw . toString ( 'hex' ) ) ;
4033 }
4134}
4235
0 commit comments