2 files changed, 3 insertions, 114 deletions

diff --git a/internal/api/api.go b/internal/api/api.go
index 88a0011..6c9ab3a 100644
--- a/internal/api/api.go
+++ b/internal/api/api.go
@@ -38,6 +38,7 @@ type ListNotesResponse struct {
 
 type CreateNoteRequest struct {
 	ContinuationToken []byte
+	FileName          string
 	Chunk             []byte
 	More              bool
 }
@@ -52,7 +53,8 @@ type ReadNoteRequest struct {
 }
 
 type ReadNoteResponseStream struct {
-	Chunk []byte
+	FileName string
+	Chunk    []byte
 }
 
 type DeleteNoteRequest struct{}
diff --git a/internal/cryptoutil/oae2.go b/internal/cryptoutil/oae2.go
index a230c06..bc8f53e 100644
--- a/internal/cryptoutil/oae2.go
+++ b/internal/cryptoutil/oae2.go
@@ -11,7 +11,6 @@ import (
 	"encoding/binary"
 	"errors"
 	"io"
-	"strings"
 )
 
 // Online Authenticated Encryption from https://eprint.iacr.org/2015/189.pdf
@@ -217,77 +216,6 @@ func (w *EncryptingWriter) Close() error {
 	return nil
 }
 
-func (w *EncryptingWriter) ReadFrom(r io.Reader) (int64, error) {
-	if !w.initialized {
-		if err := w.initialize(); err != nil {
-			return 0, err
-		}
-	}
-	if w.err != nil {
-		return 0, w.err
-	}
-	var nn int64
-	bufReader := bufio.NewReaderSize(r, 1)
-	for {
-		if _, err := bufReader.Peek(1); err != nil {
-			if err == io.EOF {
-				return nn, nil
-			}
-			return nn, err
-		}
-		if len(w.buf) == w.segmentSize {
-			if err := w.writeBuf(); err != nil {
-				return nn, err
-			}
-		}
-		n, _ := io.ReadFull(bufReader, w.buf[len(w.buf):w.segmentSize])
-		w.buf = w.buf[:len(w.buf)+n]
-		nn += int64(n)
-	}
-}
-
-func (w *EncryptingWriter) WriteByte(c byte) error {
-	if !w.initialized {
-		if err := w.initialize(); err != nil {
-			return err
-		}
-	}
-	if w.err != nil {
-		return w.err
-	}
-	if len(w.buf) == w.segmentSize {
-		if err := w.writeBuf(); err != nil {
-			return err
-		}
-	}
-	w.buf = append(w.buf, c)
-	return nil
-}
-
-func (w *EncryptingWriter) WriteString(s string) (int, error) {
-	if !w.initialized {
-		if err := w.initialize(); err != nil {
-			return 0, err
-		}
-	}
-	if w.err != nil {
-		return 0, w.err
-	}
-	r := strings.NewReader(s)
-	nn := 0
-	for r.Len() > 0 {
-		if len(w.buf) == w.segmentSize {
-			if err := w.writeBuf(); err != nil {
-				return nn, err
-			}
-		}
-		n, _ := r.Read(w.buf[len(w.buf):w.segmentSize])
-		w.buf = w.buf[:len(w.buf)+n]
-		nn += n
-	}
-	return nn, nil
-}
-
 // A DecryptingReader decrypts data using the STREAM construction.
 type DecryptingReader struct {
 	r           *bufio.Reader
@@ -367,44 +295,3 @@ func (r *DecryptingReader) Read(buf []byte) (int, error) {
 	n, _ := r.buf.Read(buf)
 	return n, nil
 }
-
-func (r *DecryptingReader) WriteTo(w io.Writer) (int64, error) {
-	if !r.initialized {
-		if err := r.initialize(); err != nil {
-			return 0, err
-		}
-	}
-	var nn int64
-	if r.buf.Len() > 0 {
-		n, err := w.Write(r.buf.Bytes())
-		nn += int64(n)
-		if err != nil {
-			return nn, err
-		}
-	}
-	for {
-		if err := r.fillBuf(); err != nil {
-			return nn, err
-		}
-		n, err := w.Write(r.buf.Bytes())
-		nn += int64(n)
-		if err != nil {
-			return nn, err
-		}
-	}
-}
-
-func (r *DecryptingReader) ReadByte() (byte, error) {
-	if !r.initialized {
-		if err := r.initialize(); err != nil {
-			return 0, err
-		}
-	}
-	if r.buf.Len() == 0 {
-		if err := r.fillBuf(); err != nil {
-			return 0, err
-		}
-	}
-	b, _ := r.buf.ReadByte()
-	return b, nil
-}