@@ -15,20 +15,20 @@ import (
15
15
func TestValidCertificateFromP12File (t * testing.T ) {
16
16
cer , err := certificate .FromP12File ("_fixtures/certificate-valid.p12" , "" )
17
17
assert .Nil (t , err )
18
- assert .Nil (t , verifyHostname ( cer ) )
18
+ assert .NotEqual (t , tls. Certificate {}, cer )
19
19
}
20
20
21
21
func TestValidCertificateFromP12Bytes (t * testing.T ) {
22
22
bytes , _ := ioutil .ReadFile ("_fixtures/certificate-valid.p12" )
23
23
cer , err := certificate .FromP12Bytes (bytes , "" )
24
24
assert .NoError (t , err )
25
- assert .Nil (t , verifyHostname ( cer ) )
25
+ assert .NotEqual (t , tls. Certificate {}, cer )
26
26
}
27
27
28
28
func TestEncryptedValidCertificateFromP12File (t * testing.T ) {
29
29
cer , err := certificate .FromP12File ("_fixtures/certificate-valid-encrypted.p12" , "password" )
30
30
assert .NoError (t , err )
31
- assert .Nil (t , verifyHostname ( cer ) )
31
+ assert .NotEqual (t , tls. Certificate {}, cer )
32
32
}
33
33
34
34
func TestNoSuchFileP12File (t * testing.T ) {
@@ -48,33 +48,33 @@ func TestBadPasswordP12File(t *testing.T) {
48
48
func TestValidCertificateFromPemFile (t * testing.T ) {
49
49
cer , err := certificate .FromPemFile ("_fixtures/certificate-valid.pem" , "" )
50
50
assert .NoError (t , err )
51
- assert .Nil (t , verifyHostname ( cer ) )
51
+ assert .NotEqual (t , tls. Certificate {}, cer )
52
52
}
53
53
54
54
func TestValidCertificateFromPemBytes (t * testing.T ) {
55
55
bytes , _ := ioutil .ReadFile ("_fixtures/certificate-valid.pem" )
56
56
cer , err := certificate .FromPemBytes (bytes , "" )
57
57
assert .NoError (t , err )
58
- assert .Nil (t , verifyHostname ( cer ) )
58
+ assert .NotEqual (t , tls. Certificate {}, cer )
59
59
}
60
60
61
61
func TestValidCertificateFromPemFileWithPKCS8PrivateKey (t * testing.T ) {
62
62
cer , err := certificate .FromPemFile ("_fixtures/certificate-valid-pkcs8.pem" , "" )
63
63
assert .NoError (t , err )
64
- assert .Nil (t , verifyHostname ( cer ) )
64
+ assert .NotEqual (t , tls. Certificate {}, cer )
65
65
}
66
66
67
67
func TestValidCertificateFromPemBytesWithPKCS8PrivateKey (t * testing.T ) {
68
68
bytes , _ := ioutil .ReadFile ("_fixtures/certificate-valid-pkcs8.pem" )
69
69
cer , err := certificate .FromPemBytes (bytes , "" )
70
70
assert .NoError (t , err )
71
- assert .Nil (t , verifyHostname ( cer ) )
71
+ assert .NotEqual (t , tls. Certificate {}, cer )
72
72
}
73
73
74
74
func TestEncryptedValidCertificateFromPemFile (t * testing.T ) {
75
75
cer , err := certificate .FromPemFile ("_fixtures/certificate-valid-encrypted.pem" , "password" )
76
76
assert .NoError (t , err )
77
- assert .Nil (t , verifyHostname ( cer ) )
77
+ assert .NotEqual (t , tls. Certificate {}, cer )
78
78
}
79
79
80
80
func TestNoSuchFilePemFile (t * testing.T ) {
@@ -106,10 +106,3 @@ func TestNoCertificatePemFile(t *testing.T) {
106
106
assert .Equal (t , tls.Certificate {}, cer )
107
107
assert .Equal (t , certificate .ErrNoCertificate , err )
108
108
}
109
-
110
- func verifyHostname (cert tls.Certificate ) error {
111
- if cert .Leaf == nil {
112
- return errors .New ("expected leaf cert" )
113
- }
114
- return cert .Leaf .VerifyHostname ("APNS/2 Development IOS Push Services: com.sideshow.Apns2" )
115
- }
0 commit comments