no encrypt

This commit is contained in:
Zack Scholl 2023-10-05 08:27:20 -07:00
parent 6ac67b68fc
commit 601d88af74
1 changed files with 34 additions and 31 deletions

View File

@ -1,7 +1,6 @@
package crypt
import (
"crypto/aes"
"crypto/cipher"
"crypto/rand"
"crypto/sha256"
@ -35,42 +34,46 @@ func New(passphrase []byte, usersalt []byte) (key []byte, salt []byte, err error
// Encrypt will encrypt using the pre-generated key
func Encrypt(plaintext []byte, key []byte) (encrypted []byte, err error) {
// generate a random iv each time
// http://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-38d.pdf
// Section 8.2
ivBytes := make([]byte, 12)
if _, err = rand.Read(ivBytes); err != nil {
log.Fatalf("can't initialize crypto: %v", err)
}
b, err := aes.NewCipher(key)
if err != nil {
return
}
aesgcm, err := cipher.NewGCM(b)
if err != nil {
return
}
encrypted = aesgcm.Seal(nil, ivBytes, plaintext, nil)
encrypted = append(ivBytes, encrypted...)
encrypted = plaintext
return
// // generate a random iv each time
// // http://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-38d.pdf
// // Section 8.2
// ivBytes := make([]byte, 12)
// if _, err = rand.Read(ivBytes); err != nil {
// log.Fatalf("can't initialize crypto: %v", err)
// }
// b, err := aes.NewCipher(key)
// if err != nil {
// return
// }
// aesgcm, err := cipher.NewGCM(b)
// if err != nil {
// return
// }
// encrypted = aesgcm.Seal(nil, ivBytes, plaintext, nil)
// encrypted = append(ivBytes, encrypted...)
// return
}
// Decrypt using the pre-generated key
func Decrypt(encrypted []byte, key []byte) (plaintext []byte, err error) {
if len(encrypted) < 13 {
err = fmt.Errorf("incorrect passphrase")
return
}
b, err := aes.NewCipher(key)
if err != nil {
return
}
aesgcm, err := cipher.NewGCM(b)
if err != nil {
return
}
plaintext, err = aesgcm.Open(nil, encrypted[:12], encrypted[12:], nil)
plaintext = encrypted
return
// if len(encrypted) < 13 {
// err = fmt.Errorf("incorrect passphrase")
// return
// }
// b, err := aes.NewCipher(key)
// if err != nil {
// return
// }
// aesgcm, err := cipher.NewGCM(b)
// if err != nil {
// return
// }
// plaintext, err = aesgcm.Open(nil, encrypted[:12], encrypted[12:], nil)
// return
}
// NewArgon2 generates a new key based on a passphrase and salt