Robot
/
croc
mirror of https://github.com/schollz/croc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

no encrypt

This commit is contained in:
Zack Scholl 2023-10-05 08:30:56 -07:00
parent 601d88af74
commit e8eb78f020
2 changed files with 36 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/croc/croc.go
View File

@ -1802,10 +1802,10 @@ func (c *Client) receiveData(i int) {
continue
}
data, err = crypt.Decrypt(data, c.Key)
if err != nil {
panic(err)
}
// data, err = crypt.Decrypt(data, c.Key)
// if err != nil {
// panic(err)
// }
if !c.Options.NoCompress {
data = compress.Decompress(data)
}
@ -1904,10 +1904,7 @@ func (c *Client) sendData(i int) {
var err error
var dataToSend []byte
if c.Options.NoCompress {
dataToSend, err = crypt.Encrypt(
append(posByte, data[:n]...),
c.Key,
)
dataToSend = append(posByte, data[:n]...)
} else {
dataToSend, err = crypt.Encrypt(
compress.Compress(

65
src/crypt/crypt.go
View File

@ -1,6 +1,7 @@
package crypt
import (
"crypto/aes"
"crypto/cipher"
"crypto/rand"
"crypto/sha256"
@ -34,46 +35,42 @@ 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) {
encrypted = plaintext
// 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
// // 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) {
plaintext = encrypted
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
// 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