iSharkFly-Docs/Packer-Cn
2
0
Fork 0
mirror of https://github.com/hashicorp/packer.git synced 2026-10-01 12:13:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #376 from justinsb/try_parse_pkcs8

Browse Source 
communicator/ssh: If PKCS1 parsing of the SSH key fails, try PKCS8
This commit is contained in:
Mitchell Hashimoto
2013-08-31 22:05:34 -07:00
parent 07ba3db25b 253be30bd1
commit 81e15a8133
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
communicator/ssh/keychain.go
+6 -1
View File
@@ -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
}