GitHubMirror/rcw
1
0
Fork 0
mirror of https://github.com/rwinkhart/rcw.git synced 2026-08-28 04:46:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Return error from wrappers.Decrypt() if Argon2 salt is not present

Browse Source
This commit is contained in:
RandyTheSilly
2026-01-25 15:57:26 -05:00
parent 2520e2459e
commit 57eefdf8b4
3 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+6 -6
View File
@@ -1,17 +1,17 @@
module github.com/rwinkhart/rcw module github.com/rwinkhart/rcw
go 1.25.4 go 1.25.6
require ( require (
github.com/Microsoft/go-winio v0.6.2 github.com/Microsoft/go-winio v0.6.2
github.com/rwinkhart/go-boilerplate v0.1.0 github.com/rwinkhart/go-boilerplate v0.2.2
github.com/rwinkhart/peercred-mini v0.1.2 github.com/rwinkhart/peercred-mini v0.1.2
golang.org/x/crypto v0.45.0 golang.org/x/crypto v0.47.0
golang.org/x/sys v0.38.0 golang.org/x/sys v0.40.0
) )
require golang.org/x/term v0.37.0 // indirect require golang.org/x/term v0.39.0 // indirect
replace golang.org/x/sys => github.com/rwinkhart/sys v0.38.0 replace golang.org/x/sys => github.com/rwinkhart/sys v0.40.0
replace github.com/Microsoft/go-winio => github.com/rwinkhart/go-winio v0.1.0 replace github.com/Microsoft/go-winio => github.com/rwinkhart/go-winio v0.1.0
go.sum
+8 -8
View File
@@ -1,12 +1,12 @@
github.com/rwinkhart/go-boilerplate v0.1.0 h1:EzlVj6R7Bxtl79Nl7R5zRcg6s+Cf2FAqGIzR4giWTQg= github.com/rwinkhart/go-boilerplate v0.2.2 h1:SVHTAQU+HWFivtUnDBcfrgClJV5ZmHyFS7/uERh7NKU=
github.com/rwinkhart/go-boilerplate v0.1.0/go.mod h1:cnzIF45I0FCOvE4YIB+26pLCUx2kWyY2llKYZruNaRY= github.com/rwinkhart/go-boilerplate v0.2.2/go.mod h1:/NVRKGslU20E5xU5YOgXzWxA6aa94BMtv5MtHRTb5Ek=
github.com/rwinkhart/go-winio v0.1.0 h1:b72agLW+dETGmhR3VbcbwnStfgKfc5AfgJOXBJDkaHg= github.com/rwinkhart/go-winio v0.1.0 h1:b72agLW+dETGmhR3VbcbwnStfgKfc5AfgJOXBJDkaHg=
github.com/rwinkhart/go-winio v0.1.0/go.mod h1:ZWa7ssZJT30CCDGJ7fk/2SBTq9BIQrrVjrcss0UW2s0= github.com/rwinkhart/go-winio v0.1.0/go.mod h1:ZWa7ssZJT30CCDGJ7fk/2SBTq9BIQrrVjrcss0UW2s0=
github.com/rwinkhart/peercred-mini v0.1.2 h1:4cGWDbv0whvLeVvbUdx84V/9p+2fS+DEXgrA1KxlRFo= github.com/rwinkhart/peercred-mini v0.1.2 h1:4cGWDbv0whvLeVvbUdx84V/9p+2fS+DEXgrA1KxlRFo=
github.com/rwinkhart/peercred-mini v0.1.2/go.mod h1:LLHG7YshHEpbpJJP+Il9nx2dnGj5O3VGE32rWmflj0c= github.com/rwinkhart/peercred-mini v0.1.2/go.mod h1:LLHG7YshHEpbpJJP+Il9nx2dnGj5O3VGE32rWmflj0c=
github.com/rwinkhart/sys v0.38.0 h1:V1PGKcUutWtD3+VdHvyvfGtPy7PDXzKHNM1IzVq1ysY= github.com/rwinkhart/sys v0.40.0 h1:ZPBbXb+27vLL518sZhhNV89jXK1KbCnFGmYJ2juOQ/c=
github.com/rwinkhart/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= github.com/rwinkhart/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q= golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8=
golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4= golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A=
golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU= golang.org/x/term v0.39.0 h1:RclSuaJf32jOqZz74CkPA9qFuVTX7vhLlpfj/IGWlqY=
golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254= golang.org/x/term v0.39.0/go.mod h1:yxzUCTP/U+FzoxfdKmLaA0RV1WgE0VY7hXBwKtY/4ww=
wrappers/highLevel.go
+8 -3
View File
@@ -1,11 +1,16 @@
package wrappers package wrappers
import "errors"
// Decrypt decrypts the provided byte slice using the provided passphrase. // Decrypt decrypts the provided byte slice using the provided passphrase.
func Decrypt(encBytes []byte, passphrase []byte) ([]byte, error) { func Decrypt(encBytes, passphrase []byte) ([]byte, error) {
var err error = nil if len(encBytes) < saltSize1 {
return nil, errors.New("High-level decrypt: Encrypted data is too short (invalid Argon2 salt)")
}
salt1 := encBytes[:saltSize1] salt1 := encBytes[:saltSize1]
encBytes = encBytes[saltSize1:] encBytes = encBytes[saltSize1:]
key1 := derivePrimaryKey(passphrase, salt1) key1 := derivePrimaryKey(passphrase, salt1)
var err error
encBytes, err = decryptCha(encBytes, key1) encBytes, err = decryptCha(encBytes, key1)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -18,7 +23,7 @@ func Decrypt(encBytes []byte, passphrase []byte) ([]byte, error) {
} }
// Encrypt encrypts the provided byte slice using the provided passphrase. // Encrypt encrypts the provided byte slice using the provided passphrase.
func Encrypt(decBytes []byte, passphrase []byte) []byte { func Encrypt(decBytes, passphrase []byte) []byte {
salt1 := getRandomBytes(saltSize1) salt1 := getRandomBytes(saltSize1)
salt2AES := getRandomBytes(saltSize2) salt2AES := getRandomBytes(saltSize2)
salt2Cha := getRandomBytes(saltSize2) salt2Cha := getRandomBytes(saltSize2)