TrueCloudLab/neoneo-go
7
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

crypto: internalize aes functions into the keys package

Browse source 
This is the only user of it and no one outside should care about these
details.
This commit is contained in:
Roman Khimov 2019-12-25 11:25:05 +03:00
parent f3391f8576
commit db5555bb15
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkg/crypto/aes256.go → pkg/crypto/keys/aes256.go
View file

@ -1,12 +1,12 @@
package crypto package keys
import ( import (
"crypto/aes" "crypto/aes"
"crypto/cipher" "crypto/cipher"
) )
// AESEncrypt encrypts the key with the given source. // aesEncrypt encrypts the key with the given source.
func AESEncrypt(src, key []byte) ([]byte, error) { func aesEncrypt(src, key []byte) ([]byte, error) {
block, err := aes.NewCipher(key) block, err := aes.NewCipher(key)
if err != nil { if err != nil {
return nil, err return nil, err
@ -19,8 +19,8 @@ func AESEncrypt(src, key []byte) ([]byte, error) {
return out, nil return out, nil
} }
// AESDecrypt decrypts the encrypted source with the given key. // aesDecrypt decrypts the encrypted source with the given key.
func AESDecrypt(crypted, key []byte) ([]byte, error) { func aesDecrypt(crypted, key []byte) ([]byte, error) {
block, err := aes.NewCipher(key) block, err := aes.NewCipher(key)
if err != nil { if err != nil {
return nil, err return nil, err

4
pkg/crypto/keys/nep2.go
View file

@ -57,7 +57,7 @@ func NEP2Encrypt(priv *PrivateKey, passphrase string) (s string, err error) {
derivedKey2 := derivedKey[32:] derivedKey2 := derivedKey[32:]
xr := xor(priv.Bytes(), derivedKey1) xr := xor(priv.Bytes(), derivedKey1)
encrypted, err := crypto.AESEncrypt(xr, derivedKey2) encrypted, err := aesEncrypt(xr, derivedKey2)
if err != nil { if err != nil {
return s, err return s, err
} }
@ -98,7 +98,7 @@ func NEP2Decrypt(key, passphrase string) (s string, err error) {
derivedKey2 := derivedKey[32:] derivedKey2 := derivedKey[32:]
encryptedBytes := b[7:] encryptedBytes := b[7:]
decrypted, err := crypto.AESDecrypt(encryptedBytes, derivedKey2) decrypted, err := aesDecrypt(encryptedBytes, derivedKey2)
if err != nil { if err != nil {
return s, err return s, err
} }