edx25519: Rename X25519Match

gabriel · gabriel · commit 448fa7366b9e · 2020-11-17T15:29:54.000-08:00
diff --git a/edx25519.go b/edx25519.go
@@ -153,38 +153,29 @@ func NewEdX25519PublicKeyFromID(id ID) (*EdX25519PublicKey, error) {
 	}, nil
 }
 
-// PublicKeyIDEquals returns true if public keys are equal.
-// It will also compare EdX25519 public keys and X25519 public keys.
-func PublicKeyIDEquals(expected ID, kid ID) bool {
+// X25519Match returns true if key IDs are equal or if either key matches their
+// X25519 counterpart.
+func X25519Match(expected ID, kid ID) bool {
 	if expected == kid {
 		return true
 	}
 	if expected.IsEdX25519() && kid.IsX25519() {
 		spk, err := NewEdX25519PublicKeyFromID(expected)
 		if err != nil {
-			panic(err)
+			return false
 		}
 		return kid == spk.X25519PublicKey().ID()
 	}
 	if kid.IsEdX25519() && expected.IsX25519() {
 		spk, err := NewEdX25519PublicKeyFromID(kid)
 		if err != nil {
-			panic(err)
+			return false
 		}
 		return expected == spk.X25519PublicKey().ID()
 	}
 	return false
 }
 
-// NewX25519PublicKeyFromEdX25519ID creates a X25519PublicKey from a EdX25519 ID.
-func NewX25519PublicKeyFromEdX25519ID(id ID) (*X25519PublicKey, error) {
-	spk, err := NewEdX25519PublicKeyFromID(id)
-	if err != nil {
-		return nil, err
-	}
-	return spk.X25519PublicKey(), nil
-}
-
 // ID for EdX25519Key.
 func (s *EdX25519PublicKey) ID() ID {
 	return s.id
diff --git a/edx25519_test.go b/edx25519_test.go
@@ -48,14 +48,22 @@ func TestNewEdX25519KeyFromPrivateKey(t *testing.T) {
 	_ = keys.NewEdX25519KeyFromPrivateKey(keys.Bytes64(bytes.Repeat([]byte{0x01}, 64)))
 }
 
-func TestPublicKeyIDEquals(t *testing.T) {
+func TestX25519Match(t *testing.T) {
 	sk := keys.GenerateEdX25519Key()
 	bid := sk.X25519Key().ID()
 
-	require.True(t, keys.PublicKeyIDEquals(sk.ID(), sk.ID()))
-	require.True(t, keys.PublicKeyIDEquals(sk.ID(), bid))
-	require.True(t, keys.PublicKeyIDEquals(bid, bid))
-	require.True(t, keys.PublicKeyIDEquals(bid, sk.ID()))
+	sk2 := keys.GenerateEdX25519Key()
+	bid2 := sk2.X25519Key().ID()
+
+	require.True(t, keys.X25519Match(sk.ID(), sk.ID()))
+	require.True(t, keys.X25519Match(sk.ID(), bid))
+	require.True(t, keys.X25519Match(bid, bid))
+	require.True(t, keys.X25519Match(bid, sk.ID()))
+
+	require.False(t, keys.X25519Match(sk.ID(), sk2.ID()))
+	require.False(t, keys.X25519Match(sk.ID(), bid2))
+	require.False(t, keys.X25519Match(bid, bid2))
+	require.False(t, keys.X25519Match(bid, sk2.ID()))
 }
 
 func ExampleGenerateEdX25519Key() {
