Skip to content

K
k3s
Commit 2cd42b1b authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #35323 from mikkeloscar/decode-pem

Automatic merge from submit-queue ssh pubkey parsing: prevent segfault
parents 1fd5289e 1b5aa2c0
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
pkg/ssh/ssh.go
View file @ 2cd42b1b
......@@ -277,6 +277,9 @@ func ParsePublicKeyFromFile(keyFile string) (*rsa.PublicKey, error) {
return nil, fmt.Errorf("error reading SSH key %s: '%v'", keyFile, err)
}
keyBlock, _ := pem.Decode(buffer)
if keyBlock == nil {
return nil, fmt.Errorf("error parsing SSH key %s: 'invalid PEM format'", keyFile)
}
key, err := x509.ParsePKIXPublicKey(keyBlock.Bytes)
if err != nil {
return nil, fmt.Errorf("error parsing SSH key %s: '%v'", keyFile, err)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment