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

openpgp: eliminate implicit rand.Reader and time.Now

Browse Source 
Fixes golang/go#2501.

R=rsc, bradfitz
CC=golang-dev
https://golang.org/cl/5653067
This commit is contained in:
Adam Langley
2012-02-20 10:48:21 -05:00
parent 6c548e9506
commit 54eafe1dea
13 changed files with 127 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openpgp/write_test.go
+10 -12
View File
@@ -6,18 +6,16 @@ package openpgp
import (
"bytes"
"crypto/rand"
"io"
"io/ioutil"
"testing"
"time"
)
func TestSignDetached(t *testing.T) {
kring, _ := ReadKeyRing(readerFromHex(testKeys1And2PrivateHex))
out := bytes.NewBuffer(nil)
message := bytes.NewBufferString(signedInput)
err := DetachSign(out, kring[0], message)
err := DetachSign(out, kring[0], message, nil)
if err != nil {
t.Error(err)
}
@@ -29,7 +27,7 @@ func TestSignTextDetached(t *testing.T) {
kring, _ := ReadKeyRing(readerFromHex(testKeys1And2PrivateHex))
out := bytes.NewBuffer(nil)
message := bytes.NewBufferString(signedInput)
err := DetachSignText(out, kring[0], message)
err := DetachSignText(out, kring[0], message, nil)
if err != nil {
t.Error(err)
}
@@ -41,7 +39,7 @@ func TestSignDetachedDSA(t *testing.T) {
kring, _ := ReadKeyRing(readerFromHex(dsaTestKeyPrivateHex))
out := bytes.NewBuffer(nil)
message := bytes.NewBufferString(signedInput)
err := DetachSign(out, kring[0], message)
err := DetachSign(out, kring[0], message, nil)
if err != nil {
t.Error(err)
}
@@ -54,14 +52,14 @@ func TestNewEntity(t *testing.T) {
return
}
e, err := NewEntity(rand.Reader, time.Now(), "Test User", "test", "test@example.com")
e, err := NewEntity("Test User", "test", "test@example.com", nil)
if err != nil {
t.Errorf("failed to create entity: %s", err)
return
}
w := bytes.NewBuffer(nil)
if err := e.SerializePrivate(w); err != nil {
if err := e.SerializePrivate(w, nil); err != nil {
t.Errorf("failed to serialize entity: %s", err)
return
}
@@ -78,7 +76,7 @@ func TestNewEntity(t *testing.T) {
}
w = bytes.NewBuffer(nil)
if err := e.SerializePrivate(w); err != nil {
if err := e.SerializePrivate(w, nil); err != nil {
t.Errorf("failed to serialize entity second time: %s", err)
return
}
@@ -90,7 +88,7 @@ func TestNewEntity(t *testing.T) {
func TestSymmetricEncryption(t *testing.T) {
buf := new(bytes.Buffer)
plaintext, err := SymmetricallyEncrypt(buf, []byte("testing"), nil)
plaintext, err := SymmetricallyEncrypt(buf, []byte("testing"), nil, nil)
if err != nil {
t.Errorf("error writing headers: %s", err)
return
@@ -107,7 +105,7 @@ func TestSymmetricEncryption(t *testing.T) {
md, err := ReadMessage(buf, nil, func(keys []Key, symmetric bool) ([]byte, error) {
return []byte("testing"), nil
})
}, nil)
if err != nil {
t.Errorf("error rereading message: %s", err)
}
@@ -171,7 +169,7 @@ func TestEncryption(t *testing.T) {
}
buf := new(bytes.Buffer)
w, err := Encrypt(buf, kring[:1], signed, nil /* no hints */ )
w, err := Encrypt(buf, kring[:1], signed, nil, /* no hints */ nil)
if err != nil {
t.Errorf("#%d: error in Encrypt: %s", i, err)
continue
@@ -189,7 +187,7 @@ func TestEncryption(t *testing.T) {
continue
}
md, err := ReadMessage(buf, kring, nil /* no prompt */ )
md, err := ReadMessage(buf, kring, nil, /* no prompt */ nil)
if err != nil {
t.Errorf("#%d: error reading message: %s", i, err)
continue