Merge pull request #49 from elisasre/adderror

add error to decrypt+encrypt

crypto.go

@@ -33,36 +33,36 @@ func createHash(key string) string {
 
 // Encrypt the secret input with passphrase
 // source https://www.thepolyglotdeveloper.com/2018/02/encrypt-decrypt-data-golang-application-crypto-packages/
-func Encrypt(data []byte, passphrase string) []byte {
+func Encrypt(data []byte, passphrase string) ([]byte, error) {
 	block, _ := aes.NewCipher([]byte(createHash(passphrase)))
 	gcm, err := cipher.NewGCM(block)
 	if err != nil {
-		panic(err.Error())
+		return nil, err
 	}
 	nonce := make([]byte, gcm.NonceSize())
 	if _, err = io.ReadFull(rand.Reader, nonce); err != nil {
-		panic(err.Error())
+		return nil, err
 	}
 	ciphertext := gcm.Seal(nonce, nonce, data, nil)
-	return ciphertext
+	return ciphertext, nil
 }
 
 // Decrypt the encrypted secret with passphrase.
-func Decrypt(data []byte, passphrase string) []byte {
+func Decrypt(data []byte, passphrase string) ([]byte, error) {
 	key := []byte(createHash(passphrase))
 	block, err := aes.NewCipher(key)
 	if err != nil {
-		panic(err.Error())
+		return nil, err
 	}
 	gcm, err := cipher.NewGCM(block)
 	if err != nil {
-		panic(err.Error())
+		return nil, err
 	}
 	nonceSize := gcm.NonceSize()
 	nonce, ciphertext := data[:nonceSize], data[nonceSize:]
 	plaintext, err := gcm.Open(nil, nonce, ciphertext, nil)
 	if err != nil {
-		panic(err.Error())
+		return nil, err
 	}
-	return plaintext
+	return plaintext, nil
 }

crypto_test.go

@@ -30,13 +30,15 @@ func ExampleBase64encode() {
 }
 
 func ExampleEncrypt() {
-	encrypted := Encrypt([]byte("supersecret"), "testpassword")
-	fmt.Println(string(Decrypt(encrypted, "testpassword")))
+	encrypted, _ := Encrypt([]byte("supersecret"), "testpassword")
+	data, _ := Decrypt(encrypted, "testpassword")
+	fmt.Println(string(data))
 	// Output: supersecret
 }
 
 func ExampleDecrypt() {
-	encrypted := Encrypt([]byte("supersecret"), "testpassword")
-	fmt.Println(string(Decrypt(encrypted, "testpassword")))
+	encrypted, _ := Encrypt([]byte("supersecret"), "testpassword")
+	data, _ := Decrypt(encrypted, "testpassword")
+	fmt.Println(string(data))
 	// Output: supersecret
 }