alexvanin/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

Fix RandomReader

Browse source
This commit is contained in:
Alexander Neumann 2016-01-17 21:27:51 +01:00
parent f53008d916
commit 109a120b39
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crypto/crypto_test.go
View file

@ -133,7 +133,6 @@ func TestLargeEncrypt(t *testing.T) {
func BenchmarkEncryptWriter(b *testing.B) { func BenchmarkEncryptWriter(b *testing.B) {
size := 8 << 20 // 8MiB size := 8 << 20 // 8MiB
rd := RandomReader(23, size)
k := crypto.NewRandomKey() k := crypto.NewRandomKey()
@ -141,7 +140,7 @@ func BenchmarkEncryptWriter(b *testing.B) {
b.SetBytes(int64(size)) b.SetBytes(int64(size))
for i := 0; i < b.N; i++ { for i := 0; i < b.N; i++ {
rd.Seek(0, 0) rd := RandomReader(23, size)
wr := crypto.EncryptTo(k, ioutil.Discard) wr := crypto.EncryptTo(k, ioutil.Discard)
n, err := io.Copy(wr, rd) n, err := io.Copy(wr, rd)
OK(b, err) OK(b, err)
@ -195,14 +194,13 @@ func BenchmarkEncryptDecryptReader(b *testing.B) {
k := crypto.NewRandomKey() k := crypto.NewRandomKey()
size := 8 << 20 // 8MiB size := 8 << 20 // 8MiB
rd := RandomReader(23, size)
b.ResetTimer() b.ResetTimer()
b.SetBytes(int64(size)) b.SetBytes(int64(size))
buf := bytes.NewBuffer(nil) buf := bytes.NewBuffer(nil)
for i := 0; i < b.N; i++ { for i := 0; i < b.N; i++ {
rd.Seek(0, 0) rd := RandomReader(23, size)
buf.Reset() buf.Reset()
wr := crypto.EncryptTo(k, buf) wr := crypto.EncryptTo(k, buf)
_, err := io.Copy(wr, rd) _, err := io.Copy(wr, rd)

1
test/helpers.go
View file

@ -90,7 +90,6 @@ type rndReader struct {
} }
func (r *rndReader) Read(p []byte) (int, error) { func (r *rndReader) Read(p []byte) (int, error) {
fmt.Printf("Read(%v)\n", len(p))
for i := range p { for i := range p {
p[i] = byte(r.src.Uint32()) p[i] = byte(r.src.Uint32())
} }