diff options
| author | Rose Hogenson <rosehogenson@posteo.net> | 2025-10-24 16:37:31 -0700 |
|---|---|---|
| committer | Rose Hogenson <rosehogenson@posteo.net> | 2025-10-24 16:37:31 -0700 |
| commit | 0cd822566776eddf8e47e61b7279aff4fa5481d7 (patch) | |
| tree | cced0871ee0af562324933795032af1f9eefb4da /oae.go | |
| parent | Use argon2 for password hashing (diff) | |
| download | sym-0cd822566776eddf8e47e61b7279aff4fa5481d7.tar.zst | |
Get rid of defaultOptions
Diffstat (limited to 'oae.go')
| -rw-r--r-- | oae.go | 12 |
1 files changed, 3 insertions, 9 deletions
@@ -22,17 +22,13 @@ const ( type segmentEncrypter struct { password string - memory int aead cipher.AEAD nonce [nonceSize]byte } func (se *segmentEncrypter) initialize(salt []byte) error { - key, err := hashPassword(se.password, salt, se.memory) - if err != nil { - return err - } + key := hashPassword(se.password, salt) block, err := aes.NewCipher(key) if err != nil { return err @@ -83,12 +79,11 @@ type encryptingWriter struct { initialized bool } -func newEncryptingWriter(w io.Writer, password string, memory int) *encryptingWriter { +func newEncryptingWriter(w io.Writer, password string) *encryptingWriter { return &encryptingWriter{ w: w, encrypter: segmentEncrypter{ password: password, - memory: memory, }, } } @@ -181,12 +176,11 @@ type decryptingReader struct { readFinalBlock bool } -func newDecryptingReader(r io.Reader, password string, memory int) *decryptingReader { +func newDecryptingReader(r io.Reader, password string) *decryptingReader { return &decryptingReader{ r: bufio.NewReaderSize(r, 0), // we only need .UnreadByte decrypter: segmentEncrypter{ password: password, - memory: memory, }, } } |
