luzifer/go-openssl
1
0
Fork 0
mirror of https://github.com/Luzifer/go-openssl.git synced 2024-12-20 19:01:18 +00:00
Code Issues Releases Wiki Activity

Fix some linter warnings

Browse source 
Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
Knut Ahlers 2018-09-11 12:16:18 +02:00
parent eb0c38a83d
commit 337596f6a2
Signed by: luzifer
GPG key ID: DC2729FDD34BE99E
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
openssl.go
View file

@ -14,6 +14,7 @@ import (
"io" "io"
) )
// ErrInvalidSalt is returned when a salt with a length of != 8 byte is passed
var ErrInvalidSalt = errors.New("Salt needs to have exactly 8 byte") var ErrInvalidSalt = errors.New("Salt needs to have exactly 8 byte")
// OpenSSL is a helper to generate OpenSSL compatible encryption // OpenSSL is a helper to generate OpenSSL compatible encryption
@ -67,7 +68,7 @@ func (o OpenSSL) DecryptBytes(passphrase string, encryptedBase64Data []byte) ([]
} }
saltHeader := data[:aes.BlockSize] saltHeader := data[:aes.BlockSize]
if string(saltHeader[:8]) != o.openSSLSaltHeader { if string(saltHeader[:8]) != o.openSSLSaltHeader {
return nil, fmt.Errorf("Does not appear to have been encrypted with OpenSSL, salt header missing.") return nil, fmt.Errorf("Does not appear to have been encrypted with OpenSSL, salt header missing")
} }
salt := saltHeader[8:] salt := saltHeader[8:]
@ -84,7 +85,7 @@ func (o OpenSSL) DecryptBytes(passphrase string, encryptedBase64Data []byte) ([]
func (o OpenSSL) decrypt(key, iv, data []byte) ([]byte, error) { func (o OpenSSL) decrypt(key, iv, data []byte) ([]byte, error) {
if len(data) == 0 || len(data)%aes.BlockSize != 0 { if len(data) == 0 || len(data)%aes.BlockSize != 0 {
return nil, fmt.Errorf("bad blocksize(%v), aes.BlockSize = %v\n", len(data), aes.BlockSize) return nil, fmt.Errorf("bad blocksize(%v), aes.BlockSize = %v", len(data), aes.BlockSize)
} }
c, err := aes.NewCipher(key) c, err := aes.NewCipher(key)
if err != nil { if err != nil {
@ -99,7 +100,7 @@ func (o OpenSSL) decrypt(key, iv, data []byte) ([]byte, error) {
return out, nil return out, nil
} }
// EncryptString encrypts a slice of bytes in a manner compatible to OpenSSL encryption // EncryptBytes encrypts a slice of bytes in a manner compatible to OpenSSL encryption
// functions using AES-256-CBC as encryption algorithm. This function generates // functions using AES-256-CBC as encryption algorithm. This function generates
// a random salt on every execution. // a random salt on every execution.
func (o OpenSSL) EncryptBytes(passphrase string, plainData []byte) ([]byte, error) { func (o OpenSSL) EncryptBytes(passphrase string, plainData []byte) ([]byte, error) {