3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-06-10 23:03:23 +02:00
Code Issues Projects Releases Packages Wiki Activity

cryptutil: fix potential race with signer

Browse source
This commit is contained in:
Bobby DeSimone 2019-07-24 11:08:36 -07:00
parent 14547a50e4
commit e30aa2c13b
No known key found for this signature in database
GPG key ID: AEE4CF12FE86D07E
5 changed files with 66 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/cryptutil/marshal.go
View file

@ -14,7 +14,7 @@ import (
func DecodePublicKey(encodedKey []byte) (*ecdsa.PublicKey, error) {
block, _ := pem.Decode(encodedKey)
if block == nil {
return nil, fmt.Errorf("marshal: decoded nil PEM block")
return nil, fmt.Errorf("cryptutil: decoded nil PEM block")
}
pub, err := x509.ParsePKIXPublicKey(block.Bytes)
if err != nil {
@ -23,7 +23,7 @@ func DecodePublicKey(encodedKey []byte) (*ecdsa.PublicKey, error) {
ecdsaPub, ok := pub.(*ecdsa.PublicKey)
if !ok {
return nil, errors.New("marshal: data was not an ECDSA public key")
return nil, errors.New("cryptutil: data was not an ECDSA public key")
}
return ecdsaPub, nil
@ -53,7 +53,7 @@ func DecodePrivateKey(encodedKey []byte) (*ecdsa.PrivateKey, error) {
block, encodedKey = pem.Decode(encodedKey)
if block == nil {
return nil, fmt.Errorf("failed to find EC PRIVATE KEY in PEM data after skipping types %v", skippedTypes)
return nil, fmt.Errorf("cryptutil: failed to find EC PRIVATE KEY in PEM data after skipping types %v", skippedTypes)
}
if block.Type == "EC PRIVATE KEY" {