veyron/security: make loadPEMKey support nil encrypted passwords.
Backward compatibility for nil encrypted passwords from old loadPEMKey
function.
Change-Id: Ic0eb4fb082dea33cc1b408ce5b2233668f101da7
diff --git a/security/agent/agentd/main.go b/security/agent/agentd/main.go
index 4ae6e0a..bcabd77 100644
--- a/security/agent/agentd/main.go
+++ b/security/agent/agentd/main.go
@@ -83,8 +83,8 @@
if os.IsNotExist(err) {
return handleDoesNotExist(dir)
}
- if err == vsecurity.MissingPassphraseErr {
- return handleMissingPassphrase(dir)
+ if err == vsecurity.PassphraseErr {
+ return handlePassphrase(dir)
}
return p, err
}
@@ -99,7 +99,7 @@
return p, err
}
-func handleMissingPassphrase(dir string) (security.Principal, error) {
+func handlePassphrase(dir string) (security.Principal, error) {
fmt.Println("Private key file is encrypted. Please enter passphrase.")
pass, err := gopass.GetPass("Enter passphrase: ")
if err != nil {
