updated function to something more meaningful

cisco · Jul 31, 2023 · 9a0c036 · 9a0c036
1 parent 121dd13
commit 9a0c036
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/lib/hpke/src/group.cpp b/lib/hpke/src/group.cpp
@@ -527,9 +527,9 @@ struct ECKeyGroup : public EVPGroup
   }
 
   // EC Key
-  void get_coordinates(const Group::PublicKey& pk,
-                       bytes& x,
-                       bytes& y) const override
+  void get_coordinates_from_public_key(const Group::PublicKey& pk,
+                                       bytes& x,
+                                       bytes& y) const override
   {
     auto bnX = make_typed_unique(BN_new());
     auto bnY = make_typed_unique(BN_new());
@@ -610,7 +610,7 @@ struct ECKeyGroup : public EVPGroup
   }
 
   // EC Key
-  std::unique_ptr<Group::PublicKey> set_coordinates(
+  std::unique_ptr<Group::PublicKey> get_public_key_from_coordinates(
     const bytes& x,
     const bytes& y) const override
   {
@@ -808,9 +808,9 @@ struct RawKeyGroup : public EVPGroup
   }
 
   // Raw Key
-  void get_coordinates(const Group::PublicKey& pk,
-                       bytes& x,
-                       bytes& /*unused*/) const override
+  void get_coordinates_from_public_key(const Group::PublicKey& pk,
+                                       bytes& x,
+                                       bytes& /*unused*/) const override
   {
     const auto& rpk = dynamic_cast<const PublicKey&>(pk);
     auto raw = bytes(pk_size);
@@ -824,7 +824,7 @@ struct RawKeyGroup : public EVPGroup
   }
 
   // Raw Key
-  std::unique_ptr<Group::PublicKey> set_coordinates(
+  std::unique_ptr<Group::PublicKey> get_public_key_from_coordinates(
     const bytes& x,
     const bytes& /*unused*/) const override
   {

diff --git a/lib/hpke/src/group.h b/lib/hpke/src/group.h
@@ -65,10 +65,10 @@ struct Group
                       const bytes& sig,
                       const PublicKey& pk) const = 0;
 
-  virtual void get_coordinates(const Group::PublicKey& pk,
-                               bytes& x,
-                               bytes& y) const = 0;
-  virtual std::unique_ptr<Group::PublicKey> set_coordinates(
+  virtual void get_coordinates_from_public_key(const Group::PublicKey& pk,
+                                               bytes& x,
+                                               bytes& y) const = 0;
+  virtual std::unique_ptr<Group::PublicKey> get_public_key_from_coordinates(
     const bytes& x,
     const bytes& y) const = 0;
 

diff --git a/lib/hpke/src/signature.cpp b/lib/hpke/src/signature.cpp
@@ -148,7 +148,7 @@ struct GroupSignature : public Signature
     if (jwk_json.contains("y")) {
       y = from_base64url(jwk_json["y"]);
     }
-    return group.set_coordinates(x, y);
+    return group.get_public_key_from_coordinates(x, y);
   }
 
   std::string export_jwk(const bytes& enc) const override
@@ -162,7 +162,7 @@ struct GroupSignature : public Signature
     std::unique_ptr<hpke::Signature::PublicKey> pk = deserialize(enc);
     const auto& rpk =
       dynamic_cast<const hpke::Group::PublicKey&>(*(pk.release()));
-    group.get_coordinates(rpk, x, y);
+    group.get_coordinates_from_public_key(rpk, x, y);
 
     if (!x.empty()) {
       json_jwk["x"] = to_base64url(x);
@@ -188,7 +188,7 @@ struct GroupSignature : public Signature
     const auto priv = group.deserialize_private(enc);
     const auto& rpk =
       dynamic_cast<const Group::PublicKey&>(*(priv->public_key().release()));
-    group.get_coordinates(rpk, x, y);
+    group.get_coordinates_from_public_key(rpk, x, y);
 
     if (!x.empty()) {
       json_jwk["x"] = to_base64url(x);