ssh: don't panic if a key is too short.
Change-Id: I810eb1c5d4cacc710a427e2ce031db1e9c292454 Reviewed-on: https://go-review.googlesource.com/132656 Run-TryBot: Adam Langley <agl@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Filippo Valsorda <filippo@golang.org> Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
+2
-2
@@ -903,8 +903,8 @@ func ParseDSAPrivateKey(der []byte) (*dsa.PrivateKey, error) {
|
|||||||
// Implemented based on the documentation at
|
// Implemented based on the documentation at
|
||||||
// https://github.com/openssh/openssh-portable/blob/master/PROTOCOL.key
|
// https://github.com/openssh/openssh-portable/blob/master/PROTOCOL.key
|
||||||
func parseOpenSSHPrivateKey(key []byte) (crypto.PrivateKey, error) {
|
func parseOpenSSHPrivateKey(key []byte) (crypto.PrivateKey, error) {
|
||||||
magic := append([]byte("openssh-key-v1"), 0)
|
const magic = "openssh-key-v1\x00"
|
||||||
if !bytes.Equal(magic, key[0:len(magic)]) {
|
if len(key) < len(magic) || string(key[:len(magic)]) != magic {
|
||||||
return nil, errors.New("ssh: invalid openssh private key format")
|
return nil, errors.New("ssh: invalid openssh private key format")
|
||||||
}
|
}
|
||||||
remaining := key[len(magic):]
|
remaining := key[len(magic):]
|
||||||
|
|||||||
@@ -13,7 +13,9 @@ import (
|
|||||||
"crypto/rsa"
|
"crypto/rsa"
|
||||||
"crypto/x509"
|
"crypto/x509"
|
||||||
"encoding/base64"
|
"encoding/base64"
|
||||||
|
"encoding/pem"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io"
|
||||||
"reflect"
|
"reflect"
|
||||||
"strings"
|
"strings"
|
||||||
"testing"
|
"testing"
|
||||||
@@ -498,3 +500,32 @@ func TestFingerprintSHA256(t *testing.T) {
|
|||||||
t.Errorf("got fingerprint %q want %q", fingerprint, want)
|
t.Errorf("got fingerprint %q want %q", fingerprint, want)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestInvalidKeys(t *testing.T) {
|
||||||
|
keyTypes := []string{
|
||||||
|
"RSA PRIVATE KEY",
|
||||||
|
"PRIVATE KEY",
|
||||||
|
"EC PRIVATE KEY",
|
||||||
|
"DSA PRIVATE KEY",
|
||||||
|
"OPENSSH PRIVATE KEY",
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, keyType := range keyTypes {
|
||||||
|
for _, dataLen := range []int{0, 1, 2, 5, 10, 20} {
|
||||||
|
data := make([]byte, dataLen)
|
||||||
|
if _, err := io.ReadFull(rand.Reader, data); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var buf bytes.Buffer
|
||||||
|
pem.Encode(&buf, &pem.Block{
|
||||||
|
Type: keyType,
|
||||||
|
Bytes: data,
|
||||||
|
})
|
||||||
|
|
||||||
|
// This test is just to ensure that the function
|
||||||
|
// doesn't panic so the return value is ignored.
|
||||||
|
ParseRawPrivateKey(buf.Bytes())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user