Merge pull request #33 from libp2p/bug/curve-name

Return error rather than panic in GenerateEKeyPair
libp2p · Jul 12, 2019 · 1d45af2 · 1d45af2
2 parents c3f7bb2 + c7c0a1c
commit 1d45af2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/crypto/key.go b/crypto/key.go
@@ -143,6 +143,8 @@ func GenerateEKeyPair(curveName string) ([]byte, GenSharedKey, error) {
 		curve = elliptic.P384()
 	case "P-521":
 		curve = elliptic.P521()
+	default:
+		return nil, nil, fmt.Errorf("unknown curve name")
 	}
 
 	priv, x, y, err := elliptic.GenerateKey(curve, rand.Reader)

diff --git a/crypto/key_test.go b/crypto/key_test.go
@@ -145,3 +145,15 @@ func (pk testkey) Raw() ([]byte, error) {
 func (pk testkey) Equals(k Key) bool {
 	return KeyEqual(pk, k)
 }
+
+func TestUnknownCurveErrors(t *testing.T) {
+	_, _, err := GenerateEKeyPair("P-256")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	_, _, err = GenerateEKeyPair("error-please")
+	if err == nil {
+		t.Fatal("expected invalid key type to error")
+	}
+}