diff options
| author | Rose Hogenson <rosehogenson@posteo.net> | 2025-10-04 16:42:41 -0700 |
|---|---|---|
| committer | Rose Hogenson <rosehogenson@posteo.net> | 2025-10-04 16:42:41 -0700 |
| commit | 81334d879828910697c5594a3dc1c39743634c5b (patch) | |
| tree | 9d26a346f7fc1059cfe23d498b25cb9fe42d956c /internal/cryptoutil | |
| parent | Allow http multipart upload (diff) | |
| download | roseh.moe-81334d879828910697c5594a3dc1c39743634c5b.tar.zst | |
Fix tests
Diffstat (limited to 'internal/cryptoutil')
| -rw-r--r-- | internal/cryptoutil/cryptoutil_test.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/internal/cryptoutil/cryptoutil_test.go b/internal/cryptoutil/cryptoutil_test.go index 0e0560c..059a9e1 100644 --- a/internal/cryptoutil/cryptoutil_test.go +++ b/internal/cryptoutil/cryptoutil_test.go @@ -64,14 +64,14 @@ func TestEncrypt(t *testing.T) { }} { t.Run(tc.desc, func(t *testing.T) { encryptedMsg := new(bytes.Buffer) - w := key.NewWriter(encryptedMsg, []byte("additional data")) + w := key.NewWriter(encryptedMsg, WithAdditionalData([]byte("additional data"))) if _, err := w.Write(tc.msg); err != nil { t.Fatalf("EncryptingWriter.Write(%q) failed: %s", tc.msg, err) } if err := w.Close(); err != nil { t.Fatalf("EncryptingWriter.Close() failed: %s", err) } - got, err := io.ReadAll(key.NewReader(bytes.NewReader(encryptedMsg.Bytes()), []byte("additional data"))) + got, err := io.ReadAll(key.NewReader(bytes.NewReader(encryptedMsg.Bytes()), WithAdditionalData([]byte("additional data")))) if err != nil { t.Fatalf("DecryptingReader.Read(%x) failed: %s", encryptedMsg, err) } @@ -98,14 +98,14 @@ func TestDeriveKey(t *testing.T) { } msg := []byte("test message") encryptedMsg := new(bytes.Buffer) - w := key.NewWriter(encryptedMsg, []byte("additional data")) + w := key.NewWriter(encryptedMsg, WithAdditionalData([]byte("additional data"))) if _, err := w.Write(msg); err != nil { t.Fatalf("EncryptingWriter.Write(%q) failed: %s", msg, err) } if err := w.Close(); err != nil { t.Fatalf("EncryptingWriter.Close() failed: %s", err) } - got, err := io.ReadAll(key.NewReader(encryptedMsg, []byte("additional data"))) + got, err := io.ReadAll(key.NewReader(encryptedMsg, WithAdditionalData([]byte("additional data")))) if err != nil { t.Fatalf("DecryptingReader.Read(%x) failed: %s", encryptedMsg, err) } @@ -120,10 +120,10 @@ func BenchmarkEncrypt(b *testing.B) { for i := range msg { msg[i] = byte(i) } - encryptedMsg := bytes.NewBuffer(make([]byte, 0, 35+len(msg)+16*(len(msg)+segmentSize-1)/segmentSize /* ?? */)) + encryptedMsg := bytes.NewBuffer(make([]byte, 0, 35+len(msg)+16*(len(msg)+defaultOpts.segmentSize-1)/defaultOpts.segmentSize /* ?? */)) additionalData := []byte("additional data") for b.Loop() { - w := key.NewWriter(encryptedMsg, additionalData) + w := key.NewWriter(encryptedMsg, WithAdditionalData(additionalData)) if _, err := w.Write(msg); err != nil { b.Fatal(err) } @@ -142,7 +142,7 @@ func BenchmarkDecrypt(b *testing.B) { } encryptedMsg := new(bytes.Buffer) additionalData := []byte("additional data") - w := key.NewWriter(encryptedMsg, additionalData) + w := key.NewWriter(encryptedMsg, WithAdditionalData(additionalData)) if _, err := w.Write(msg); err != nil { b.Fatal(err) } @@ -151,7 +151,7 @@ func BenchmarkDecrypt(b *testing.B) { } decryptedMsg := make([]byte, len(msg)) for b.Loop() { - r := key.NewReader(bytes.NewReader(encryptedMsg.Bytes()), additionalData) + r := key.NewReader(bytes.NewReader(encryptedMsg.Bytes()), WithAdditionalData(additionalData)) if _, err := io.ReadFull(r, decryptedMsg); err != nil { b.Fatal(err) } |