openpgp/packet: support crypto.Decrypter in EncryptedKey.Decrypt

Fixes golang/go#33301

Change-Id: I74a389367d34d4718d70349794027ed9f1eca370
GitHub-Last-Rev: 6d95cdf63248a54b134027ed49641c204187f188
GitHub-Pull-Request: golang/crypto#94
Reviewed-on: https://go-review.googlesource.com/c/crypto/+/189497
Reviewed-by: Filippo Valsorda <filippo@golang.org>
Run-TryBot: Filippo Valsorda <filippo@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Scott Ragan
2019-10-02 19:21:27 +00:00
committed by Filippo Valsorda
parent f9e2070545
commit 34f69633bf
3 changed files with 74 additions and 3 deletions
+69
View File
@@ -6,9 +6,11 @@ package packet
import (
"bytes"
"crypto"
"crypto/rsa"
"encoding/hex"
"fmt"
"io"
"math/big"
"testing"
)
@@ -80,6 +82,73 @@ func TestDecryptingEncryptedKey(t *testing.T) {
}
}
type rsaDecrypter struct {
rsaPrivateKey *rsa.PrivateKey
decryptCount int
}
func (r *rsaDecrypter) Public() crypto.PublicKey {
return &r.rsaPrivateKey.PublicKey
}
func (r *rsaDecrypter) Decrypt(rand io.Reader, msg []byte, opts crypto.DecrypterOpts) (plaintext []byte, err error) {
r.decryptCount++
return r.rsaPrivateKey.Decrypt(rand, msg, opts)
}
func TestRSADecrypter(t *testing.T) {
const encryptedKeyHex = "c18c032a67d68660df41c70104005789d0de26b6a50c985a02a13131ca829c413a35d0e6fa8d6842599252162808ac7439c72151c8c6183e76923fe3299301414d0c25a2f06a2257db3839e7df0ec964773f6e4c4ac7ff3b48c444237166dd46ba8ff443a5410dc670cb486672fdbe7c9dfafb75b4fea83af3a204fe2a7dfa86bd20122b4f3d2646cbeecb8f7be8"
const expectedKeyHex = "d930363f7e0308c333b9618617ea728963d8df993665ae7be1092d4926fd864b"
p, err := Read(readerFromHex(encryptedKeyHex))
if err != nil {
t.Errorf("error from Read: %s", err)
return
}
ek, ok := p.(*EncryptedKey)
if !ok {
t.Errorf("didn't parse an EncryptedKey, got %#v", p)
return
}
if ek.KeyId != 0x2a67d68660df41c7 || ek.Algo != PubKeyAlgoRSA {
t.Errorf("unexpected EncryptedKey contents: %#v", ek)
return
}
customDecrypter := &rsaDecrypter{
rsaPrivateKey: encryptedKeyRSAPriv,
}
customKeyPriv := &PrivateKey{
PublicKey: PublicKey{
PubKeyAlgo: PubKeyAlgoRSA,
},
PrivateKey: customDecrypter,
}
err = ek.Decrypt(customKeyPriv, nil)
if err != nil {
t.Errorf("error from Decrypt: %s", err)
return
}
if ek.CipherFunc != CipherAES256 {
t.Errorf("unexpected EncryptedKey contents: %#v", ek)
return
}
keyHex := fmt.Sprintf("%x", ek.Key)
if keyHex != expectedKeyHex {
t.Errorf("bad key, got %s want %s", keyHex, expectedKeyHex)
}
if customDecrypter.decryptCount != 1 {
t.Errorf("Expected customDecrypter.Decrypt() to be called 1 time, but was called %d times", customDecrypter.decryptCount)
}
}
func TestEncryptingEncryptedKey(t *testing.T) {
key := []byte{1, 2, 3, 4}
const expectedKeyHex = "01020304"