chore: upgrade apns2 version
This commit is contained in:
23
vendor/github.com/sideshow/apns2/certificate/certificate.go
generated
vendored
23
vendor/github.com/sideshow/apns2/certificate/certificate.go
generated
vendored
@@ -16,17 +16,17 @@ import (
|
||||
|
||||
// Possible errors when parsing a certificate.
|
||||
var (
|
||||
ErrFailedToDecryptKey = errors.New("failed to decrypt private key")
|
||||
ErrFailedToParsePKCS1PrivateKey = errors.New("failed to parse PKCS1 private key")
|
||||
ErrFailedToParseCertificate = errors.New("failed to parse certificate PEM data")
|
||||
ErrNoPrivateKey = errors.New("no private key")
|
||||
ErrNoCertificate = errors.New("no certificate")
|
||||
ErrFailedToDecryptKey = errors.New("failed to decrypt private key")
|
||||
ErrFailedToParsePrivateKey = errors.New("failed to parse private key")
|
||||
ErrFailedToParseCertificate = errors.New("failed to parse certificate PEM data")
|
||||
ErrNoPrivateKey = errors.New("no private key")
|
||||
ErrNoCertificate = errors.New("no certificate")
|
||||
)
|
||||
|
||||
// FromP12File loads a PKCS#12 certificate from a local file and returns a
|
||||
// tls.Certificate.
|
||||
//
|
||||
// Use "" as the password argument if the pem certificate is not password
|
||||
// Use "" as the password argument if the PKCS#12 certificate is not password
|
||||
// protected.
|
||||
func FromP12File(filename string, password string) (tls.Certificate, error) {
|
||||
p12bytes, err := ioutil.ReadFile(filename)
|
||||
@@ -120,9 +120,14 @@ func unencryptPrivateKey(block *pem.Block, password string) (crypto.PrivateKey,
|
||||
}
|
||||
|
||||
func parsePrivateKey(bytes []byte) (crypto.PrivateKey, error) {
|
||||
var key crypto.PrivateKey
|
||||
key, err := x509.ParsePKCS1PrivateKey(bytes)
|
||||
if err != nil {
|
||||
return nil, ErrFailedToParsePKCS1PrivateKey
|
||||
if err == nil {
|
||||
return key, nil
|
||||
}
|
||||
return key, nil
|
||||
key, err = x509.ParsePKCS8PrivateKey(bytes)
|
||||
if err == nil {
|
||||
return key, nil
|
||||
}
|
||||
return nil, ErrFailedToParsePrivateKey
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user