key::GenericKey: Make crate-private and undeprecate

Author: felinira

src/core/key.rs

@@ -21,11 +21,7 @@ impl KeyPurpose for WormholeKey {}
 
 /// A generic key purpose for ad-hoc subkeys or if you don't care.
 #[derive(Debug)]
-#[deprecated(
-    since = "0.7.0",
-    note = "This will be a private type in the future. Open an issue if you require access to protocol intrinsics in the future"
-)]
-pub struct GenericKey;
+pub(crate) struct GenericKey;
 impl KeyPurpose for GenericKey {}
 
 /**

src/lib.rs

@@ -38,7 +38,7 @@ pub mod uri;
 
 #[expect(deprecated)]
 pub use crate::core::{
-    key::{GenericKey, Key, KeyPurpose, WormholeKey},
+    key::{Key, KeyPurpose, WormholeKey},
     rendezvous, AppConfig, AppID, Code, MailboxConnection, Mood, Nameplate, ParseCodeError,
     ParseNameplateError, ParsePasswordError, Password, Wormhole, WormholeError, WormholeWelcome,
 };

src/transit.rs

@@ -13,7 +13,7 @@
 //! **Notice:** while the resulting TCP connection is naturally bi-directional, the handshake is not symmetric. There *must* be one
 //! "leader" side and one "follower" side (formerly called "sender" and "receiver").
 
-use crate::{Key, KeyPurpose};
+use crate::{core::key::GenericKey, Key, KeyPurpose};
 use serde_derive::{Deserialize, Serialize};
 
 #[cfg(not(target_family = "wasm"))]
@@ -1499,7 +1499,7 @@ async fn handshake_exchange(
     if host_type != &ConnectionType::Direct {
         tracing::trace!("initiating relay handshake");
 
-        let sub_key = key.derive_subkey_from_purpose::<crate::GenericKey>("transit_relay_token");
+        let sub_key = key.derive_subkey_from_purpose::<GenericKey>("transit_relay_token");
         socket
             .write_all(format!("please relay {} for side {}\n", sub_key.to_hex(), tside).as_bytes())
             .await?;

src/transit/crypto.rs

@@ -9,7 +9,7 @@ use super::{
     TransitError, TransitKey, TransitRxKey, TransitTransport, TransitTransportRx,
     TransitTransportTx, TransitTxKey,
 };
-use crate::Key;
+use crate::core::key::{GenericKey, Key};
 use async_trait::async_trait;
 use crypto_secretbox as secretbox;
 use crypto_secretbox::{aead::Aead, KeyInit};
@@ -127,7 +127,7 @@ impl TransitCryptoInit for SecretboxInit {
                 format!(
                     "transit sender {} ready\n\n",
                     self.key
-                        .derive_subkey_from_purpose::<crate::GenericKey>("transit_sender")
+                        .derive_subkey_from_purpose::<GenericKey>("transit_sender")
                         .to_hex()
                 )
                 .as_bytes(),
@@ -137,7 +137,7 @@ impl TransitCryptoInit for SecretboxInit {
         let expected_rx_handshake = format!(
             "transit receiver {} ready\n\n",
             self.key
-                .derive_subkey_from_purpose::<crate::GenericKey>("transit_receiver")
+                .derive_subkey_from_purpose::<GenericKey>("transit_receiver")
                 .to_hex()
         );
         assert_eq!(expected_rx_handshake.len(), 89);
@@ -196,7 +196,7 @@ impl TransitCryptoInit for SecretboxInit {
                 format!(
                     "transit receiver {} ready\n\n",
                     self.key
-                        .derive_subkey_from_purpose::<crate::GenericKey>("transit_receiver")
+                        .derive_subkey_from_purpose::<GenericKey>("transit_receiver")
                         .to_hex(),
                 )
                 .as_bytes(),
@@ -206,7 +206,7 @@ impl TransitCryptoInit for SecretboxInit {
         let expected_tx_handshake = format!(
             "transit sender {} ready\n\ngo\n",
             self.key
-                .derive_subkey_from_purpose::<crate::GenericKey>("transit_sender")
+                .derive_subkey_from_purpose::<GenericKey>("transit_sender")
                 .to_hex(),
         );
         assert_eq!(expected_tx_handshake.len(), 90);