eiac/crypto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

crypto/openpgp: don't panic on nil private signing key in Encrypt

Browse Source 
Change-Id: Ib9ef560da02d5d0273eb85137f41253f7cdbe756
Reviewed-on: https://go-review.googlesource.com/10684
Reviewed-by: Adam Langley <agl@golang.org>
This commit is contained in:
Giovanni Bajo
2015-06-27 20:43:49 +00:00
committed by Adam Langley
parent 60052bd85f
commit f1b99bc9f1
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openpgp/write.go
+8 -4
View File
@@ -6,14 +6,15 @@ package openpgp
import ( import (
"crypto" "crypto"
"golang.org/x/crypto/openpgp/armor"
"golang.org/x/crypto/openpgp/errors"
"golang.org/x/crypto/openpgp/packet"
"golang.org/x/crypto/openpgp/s2k"
"hash" "hash"
"io" "io"
"strconv" "strconv"
"time" "time"
"golang.org/x/crypto/openpgp/armor"
"golang.org/x/crypto/openpgp/errors"
"golang.org/x/crypto/openpgp/packet"
"golang.org/x/crypto/openpgp/s2k"
) )
// DetachSign signs message with the private key from signer (which must // DetachSign signs message with the private key from signer (which must
@@ -176,6 +177,9 @@ func Encrypt(ciphertext io.Writer, to []*Entity, signed *Entity, hints *FileHint
return nil, errors.InvalidArgumentError("no valid signing keys") return nil, errors.InvalidArgumentError("no valid signing keys")
} }
signer = signKey.PrivateKey signer = signKey.PrivateKey
if signer == nil {
return nil, errors.InvalidArgumentError("no private key in signing key")
}
if signer.Encrypted { if signer.Encrypted {
return nil, errors.InvalidArgumentError("signing key must be decrypted") return nil, errors.InvalidArgumentError("signing key must be decrypted")
} }