gpgx: only decrypt private key if it has a password

moov-io · Jun 15, 2020 · 4cc5b73 · 4cc5b73
1 parent 7d0089f
commit 4cc5b73
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/internal/gpgx/keys.go b/internal/gpgx/keys.go
@@ -35,9 +35,13 @@ func ReadPrivateKeyFile(path string, password []byte) (openpgp.EntityList, error
 	entity := entityList[0]
 
 	// Get the passphrase and read the private key.
-	entity.PrivateKey.Decrypt(password)
+	if entity.PrivateKey != nil && len(password) > 0 {
+		entity.PrivateKey.Decrypt(password)
+	}
 	for _, subkey := range entity.Subkeys {
-		subkey.PrivateKey.Decrypt(password)
+		if subkey.PrivateKey != nil && len(password) > 0 {
+			subkey.PrivateKey.Decrypt(password)
+		}
 	}
 
 	return entityList, nil

diff --git a/internal/gpgx/keys_test.go b/internal/gpgx/keys_test.go
@@ -5,7 +5,6 @@
 package gpgx
 
 import (
-	"io/ioutil"
 	"path/filepath"
 	"testing"
 )