Merge pull request #376 from justinsb/try_parse_pkcs8

communicator/ssh: If PKCS1 parsing of the SSH key fails, try PKCS8

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
 	}