key::Key: Remove deprecations

Author: felinira

src/core.rs

@@ -435,7 +435,7 @@ impl Wormhole {
     pub async fn send(&mut self, plaintext: Vec<u8>) -> Result<(), WormholeError> {
         let phase_string = Phase::numeric(self.phase);
         self.phase += 1;
-        let data_key = key::derive_phase_key(self.server.side(), &self.key, &phase_string);
+        let data_key = key::derive_phase_key(self.server.side(), self.key.as_ref(), &phase_string);
         let (_nonce, encrypted) = key::encrypt_data(&data_key, &plaintext);
         self.server
             .send_peer_message(phase_string, encrypted)
@@ -474,7 +474,7 @@ impl Wormhole {
 
             // TODO maybe reorder incoming messages by phase numeral?
             let decrypted_message = peer_message
-                .decrypt(&self.key)
+                .decrypt(self.key.as_ref())
                 .ok_or(WormholeError::Crypto)?;
 
             // Send to client

src/core/key.rs

@@ -29,18 +29,9 @@ impl KeyPurpose for GenericKey {}
  *
  * You don't need to do any crypto, but you might need it to derive subkeys for sub-protocols.
  */
-#[derive(Debug, Clone, derive_more::Display, derive_more::Deref)]
+#[derive(Debug, Clone, derive_more::Display)]
 #[display("{:?}", _0)]
-#[deref(forward)]
-pub struct Key<P: KeyPurpose>(
-    #[deref]
-    #[deprecated(
-        since = "0.7.0",
-        note = "Use the AsRef<Key> implementation to get access to the secretbox key"
-    )]
-    pub Box<secretbox::Key>,
-    #[deref(ignore)] std::marker::PhantomData<P>,
-);
+pub struct Key<P: KeyPurpose>(Box<secretbox::Key>, std::marker::PhantomData<P>);
 
 impl Key<WormholeKey> {
     /**
@@ -52,11 +43,7 @@ impl Key<WormholeKey> {
      * The new key is derived with the `"{appid}/transit-key"` purpose.
      */
     #[cfg(feature = "transit")]
-    #[deprecated(
-        since = "0.7.0",
-        note = "This will be a private method in the future. Open an issue if you require access to protocol intrinsics in the future"
-    )]
-    pub fn derive_transit_key(&self, appid: &AppID) -> Key<crate::transit::TransitKey> {
+    pub(crate) fn derive_transit_key(&self, appid: &AppID) -> Key<crate::transit::TransitKey> {
         let transit_purpose = format!("{}/transit-key", appid);
         let derived_key = self.derive_subkey_from_purpose(&transit_purpose);
         tracing::trace!(
@@ -77,20 +64,32 @@ impl<P: KeyPurpose> Key<P> {
 
     /// Encode a key as a hex string
     pub fn to_hex(&self) -> String {
-        hex::encode(**self)
+        hex::encode(*self.0)
     }
 
     /**
      * Derive a new sub-key from this one
      */
     pub fn derive_subkey_from_purpose<NewP: KeyPurpose>(&self, purpose: &str) -> Key<NewP> {
         Key(
-            Box::new(derive_key(self, purpose.as_bytes())),
+            Box::new(derive_key(&self.0, purpose.as_bytes())),
             std::marker::PhantomData,
         )
     }
 }
 
+impl<P: KeyPurpose> AsRef<secretbox::Key> for Key<P> {
+    fn as_ref(&self) -> &secretbox::Key {
+        &self.0
+    }
+}
+
+impl<P: KeyPurpose> AsRef<[u8]> for Key<P> {
+    fn as_ref(&self) -> &[u8] {
+        &self.0.as_slice()
+    }
+}
+
 #[derive(Serialize, Deserialize, Debug)]
 struct PhaseMessage {
     #[serde(with = "hex::serde")]

src/transit/crypto.rs

@@ -265,7 +265,7 @@ impl TransitCryptoInit for NoiseInit {
             builder.set_is_initiator(true);
             builder.build_handshake_state()
         };
-        handshake.push_psk(&self.key);
+        handshake.push_psk((*self.key).as_ref());
 
         // → psk, e
         socket
@@ -332,7 +332,7 @@ impl TransitCryptoInit for NoiseInit {
             builder.set_is_initiator(false);
             builder.build_handshake_state()
         };
-        handshake.push_psk(&self.key);
+        handshake.push_psk((*self.key).as_ref());
 
         // ← psk, e
         handshake.read_message(&socket.read_transit_message().await?, &mut [])?;
@@ -408,7 +408,7 @@ impl TransitCryptoEncrypt for SecretboxCryptoEncrypt {
         plaintext: &[u8],
     ) -> Result<(), TransitError> {
         let nonce = &mut self.snonce;
-        let sodium_key = secretbox::Key::from_slice(&self.skey);
+        let sodium_key = secretbox::Key::from_slice(self.skey.as_ref());
 
         let ciphertext = {
             let nonce_le = secretbox::Nonce::from_slice(nonce);
@@ -466,7 +466,8 @@ impl TransitCryptoDecrypt for SecretboxCryptoDecrypt {
                 crate::util::sodium_increment_be(nonce);
             }
 
-            let cipher = secretbox::XSalsa20Poly1305::new(secretbox::Key::from_slice(&self.rkey));
+            let cipher =
+                secretbox::XSalsa20Poly1305::new(secretbox::Key::from_slice(self.rkey.as_ref()));
             cipher
                 .decrypt(secretbox::Nonce::from_slice(received_nonce), ciphertext)
                 /* TODO replace with (TransitError::Crypto) after the next xsalsa20poly1305 update */