If PKCS1 parsing of the SSH key fails, try PKCS8

253be30b · Justin Santa Barbara · 13198eb5 · 253be30b
Commit 253be30b authored Aug 31, 2013 by Justin Santa Barbara
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

communicator/ssh/keychain.go communicator/ssh/keychain.go +6 -1

No files found.
--- a/communicator/ssh/keychain.go
+++ b/communicator/ssh/keychain.go
@@ -24,7 +24,12 @@ func (k *SimpleKeychain) AddPEMKey(key string) (err error) {
 		return errors.New("no block in key")
 	}

-	rsakey, err := x509.ParsePKCS1PrivateKey(block.Bytes)
+	var rsakey interface{}
+	rsakey, err = x509.ParsePKCS1PrivateKey(block.Bytes)
+	if err != nil {
+		rsakey, err = x509.ParsePKCS8PrivateKey(block.Bytes)
+	}
+
 	if err != nil {
 		return
 	}