From: Adam Langley <agl@golang.org>
Date: Thu, 22 Oct 2009 02:49:01 +0000 (-0700)
Subject: Replace SliceReader with bytes.Buffer.
X-Git-Tag: weekly.2009-11-06~238
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=1d390cec1e7f04f610a9391c194cae8148d4756d;p=gostls13.git

Replace SliceReader with bytes.Buffer.

R=r
APPROVED=r
DELTA=16  (0 added, 15 deleted, 1 changed)
OCL=35976
CL=35978
---

diff --git a/src/pkg/crypto/rsa/rsa_test.go b/src/pkg/crypto/rsa/rsa_test.go
index 0247e97adb..a30982c940 100644
--- a/src/pkg/crypto/rsa/rsa_test.go
+++ b/src/pkg/crypto/rsa/rsa_test.go
@@ -42,21 +42,6 @@ func TestKeyGeneration(t *testing.T) {
 	}
 }
 
-type SliceReader struct {
-	s	[]byte;
-	offset	int;
-}
-
-func (s SliceReader) Read(out []byte) (n int, err os.Error) {
-	if s.offset == len(s.s) {
-		err = os.EOF;
-		return;
-	}
-	n = bytes.Copy(out, s.s[s.offset : len(s.s)]);
-	s.offset += n;
-	return;
-}
-
 type testEncryptOAEPMessage struct {
 	in	[]byte;
 	seed	[]byte;
@@ -78,7 +63,7 @@ func TestEncryptOAEP(t *testing.T) {
 		public := PublicKey{n, test.e};
 
 		for j, message := range test.msgs {
-			randomSource := SliceReader{message.seed, 0};
+			randomSource := bytes.NewBuffer(message.seed);
 			out, err := EncryptOAEP(sha1, randomSource, &public, message.in, nil);
 			if err != nil {
 				t.Errorf("#%d,%d error: %s", i, j, err);