wip: debugging issue

privacy/privacy.go

@@ -6,11 +6,8 @@ import (
 	"encoding/binary"
 	"encoding/json"
 	"errors"
-	"io"
-	"os"
-
 	"golang.org/x/crypto/chacha20poly1305"
-	"golang.org/x/term"
+	"io"
 )
 
 type CipherMethodType byte
@@ -369,17 +366,3 @@ func (r *Reader) Read(b []byte) (n int, err error) {
 
 	return copied, nil
 }
-
-func ReadPassphraseFromTerminal() (string, error) {
-	var inputFd = int(os.Stdin.Fd())
-	if !term.IsTerminal(inputFd) {
-		return "", errors.New("not a terminal")
-	}
-
-	passwd, err := term.ReadPassword(inputFd)
-	if err != nil {
-		return "", err
-	}
-
-	return string(passwd), nil
-}

privacy/privacy_test.go

@@ -91,14 +91,25 @@ func TestReadWriteClose(t *testing.T) {
 	ur := mr.New(mr.NewSource(1))
 	bb := make([]byte, 1048)
 
-	var bar int
+	var (
+		//bar int
+		n  int
+		wl int
+		rl int
+	)
 	for i := 0; i < 63; i++ {
-		bar = 1000 + ur.Intn(49)
-		ur.Read(bb[:bar])
-		sha.Write(bb[:bar])
-		if _, err = writer.Write(bb[:bar]); err != nil {
+		//bar = 1000 + ur.Intn(49)
+		//ur.Read(bb[:bar])
+		//sha.Write(bb[:bar])
+		//if n, err = writer.Write(bb[:bar]); err != nil {
+		//	t.Fatal("unexpected: Write failed", err)
+		//}
+		ur.Read(bb)
+		sha.Write(bb)
+		if n, err = writer.Write(bb); err != nil {
 			t.Fatal("unexpected: Write failed", err)
 		}
+		wl += n
 	}
 
 	if err = writer.Close(); err != nil {
@@ -120,25 +131,29 @@ func TestReadWriteClose(t *testing.T) {
 
 	sha.Reset()
 	err = nil
+	n = 0
 	for err == nil {
-		if _, err = reader.Read(bb); err != nil {
+		if n, err = reader.Read(bb); err != nil {
 			if err == io.EOF {
 				continue
 			} else {
 				t.Fatal("unexpected: Read failed", err)
 			}
 		}
+		rl += n
 		sha.Write(bb)
 	}
 
 	readHash := sha.Sum(nil)
 	t.Log("read hash:", hex.EncodeToString(readHash))
 
-	//for i := range writeHash {
-	//	if readHash[i] != writeHash[i] {
-	//		t.Fatal("unexpected: mismatch hash")
-	//	}
-	//}
+	t.Log("wl", wl)
+	t.Log("rl", rl)
+	for i := range writeHash {
+		if readHash[i] != writeHash[i] {
+			t.Fatal("unexpected: mismatch hash")
+		}
+	}
 }
 
 func TestTrial(t *testing.T) {