From 30a3205fa7ccae053f3811ac341a0410a562ed30 Mon Sep 17 00:00:00 2001
From: Julien Cretin <cretin@google.com>
Date: Fri, 1 Jul 2022 10:58:56 +0200
Subject: [PATCH] Address comments

---
 src/ctap/crypto_wrapper.rs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/ctap/crypto_wrapper.rs b/src/ctap/crypto_wrapper.rs
index 3df063a..6a35bd1 100644
--- a/src/ctap/crypto_wrapper.rs
+++ b/src/ctap/crypto_wrapper.rs
@@ -155,7 +155,7 @@ impl PrivateKey {
     /// Returns the ECDSA private key.
     pub fn ecdsa_key(&self, env: &mut impl Env) -> Option<ecdsa::SecKey> {
         match self {
-            PrivateKey::Ecdsa(seed) => ecdsa_key(env, seed),
+            PrivateKey::Ecdsa(seed) => ecdsa_key_from_seed(env, seed),
             #[allow(unreachable_patterns)]
             _ => None,
         }
@@ -164,7 +164,9 @@ impl PrivateKey {
     /// Returns the corresponding public key.
     pub fn get_pub_key(&self, env: &mut impl Env) -> Option<CoseKey> {
         Some(match self {
-            PrivateKey::Ecdsa(ecdsa_seed) => CoseKey::from(ecdsa_key(env, ecdsa_seed)?.genpk()),
+            PrivateKey::Ecdsa(ecdsa_seed) => {
+                CoseKey::from(ecdsa_key_from_seed(env, ecdsa_seed)?.genpk())
+            }
             #[cfg(feature = "ed25519")]
             PrivateKey::Ed25519(ed25519_key) => CoseKey::from(ed25519_key.public_key()),
         })
@@ -173,7 +175,7 @@ impl PrivateKey {
     /// Returns the encoded signature for a given message.
     pub fn sign_and_encode(&self, env: &mut impl Env, message: &[u8]) -> Option<Vec<u8>> {
         Some(match self {
-            PrivateKey::Ecdsa(ecdsa_seed) => ecdsa_key(env, ecdsa_seed)?
+            PrivateKey::Ecdsa(ecdsa_seed) => ecdsa_key_from_seed(env, ecdsa_seed)?
                 .sign_rfc6979::<Sha256>(message)
                 .to_asn1_der(),
             #[cfg(feature = "ed25519")]
@@ -200,7 +202,7 @@ impl PrivateKey {
     }
 }
 
-fn ecdsa_key(env: &mut impl Env, seed: &[u8; 32]) -> Option<ecdsa::SecKey> {
+fn ecdsa_key_from_seed(env: &mut impl Env, seed: &[u8; 32]) -> Option<ecdsa::SecKey> {
     let ecdsa_bytes = env.key_store().derive_ecdsa(seed).ok()?;
     ecdsa::SecKey::from_bytes(&ecdsa_bytes)
 }