Skip to content

Commit 4c97096

Browse files
committed
key::GenericKey: Make crate-private and undeprecate
1 parent 3438726 commit 4c97096

File tree

4 files changed

+9
-13
lines changed

4 files changed

+9
-13
lines changed

src/core/key.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,7 @@ impl KeyPurpose for WormholeKey {}
2121

2222
/// A generic key purpose for ad-hoc subkeys or if you don't care.
2323
#[derive(Debug)]
24-
#[deprecated(
25-
since = "0.7.0",
26-
note = "This will be a private type in the future. Open an issue if you require access to protocol intrinsics in the future"
27-
)]
28-
pub struct GenericKey;
24+
pub(crate) struct GenericKey;
2925
impl KeyPurpose for GenericKey {}
3026

3127
/**

src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pub mod uri;
3838

3939
#[expect(deprecated)]
4040
pub use crate::core::{
41-
key::{GenericKey, Key, KeyPurpose, WormholeKey},
41+
key::{Key, KeyPurpose, WormholeKey},
4242
rendezvous, AppConfig, AppID, Code, MailboxConnection, Mood, Nameplate, ParseCodeError,
4343
ParseNameplateError, ParsePasswordError, Password, Wormhole, WormholeError, WormholeWelcome,
4444
};

src/transit.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
//! **Notice:** while the resulting TCP connection is naturally bi-directional, the handshake is not symmetric. There *must* be one
1414
//! "leader" side and one "follower" side (formerly called "sender" and "receiver").
1515
16-
use crate::{Key, KeyPurpose};
16+
use crate::{core::key::GenericKey, Key, KeyPurpose};
1717
use serde_derive::{Deserialize, Serialize};
1818

1919
#[cfg(not(target_family = "wasm"))]
@@ -1499,7 +1499,7 @@ async fn handshake_exchange(
14991499
if host_type != &ConnectionType::Direct {
15001500
tracing::trace!("initiating relay handshake");
15011501

1502-
let sub_key = key.derive_subkey_from_purpose::<crate::GenericKey>("transit_relay_token");
1502+
let sub_key = key.derive_subkey_from_purpose::<GenericKey>("transit_relay_token");
15031503
socket
15041504
.write_all(format!("please relay {} for side {}\n", sub_key.to_hex(), tside).as_bytes())
15051505
.await?;

src/transit/crypto.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use super::{
99
TransitError, TransitKey, TransitRxKey, TransitTransport, TransitTransportRx,
1010
TransitTransportTx, TransitTxKey,
1111
};
12-
use crate::Key;
12+
use crate::core::key::{GenericKey, Key};
1313
use async_trait::async_trait;
1414
use crypto_secretbox as secretbox;
1515
use crypto_secretbox::{aead::Aead, KeyInit};
@@ -127,7 +127,7 @@ impl TransitCryptoInit for SecretboxInit {
127127
format!(
128128
"transit sender {} ready\n\n",
129129
self.key
130-
.derive_subkey_from_purpose::<crate::GenericKey>("transit_sender")
130+
.derive_subkey_from_purpose::<GenericKey>("transit_sender")
131131
.to_hex()
132132
)
133133
.as_bytes(),
@@ -137,7 +137,7 @@ impl TransitCryptoInit for SecretboxInit {
137137
let expected_rx_handshake = format!(
138138
"transit receiver {} ready\n\n",
139139
self.key
140-
.derive_subkey_from_purpose::<crate::GenericKey>("transit_receiver")
140+
.derive_subkey_from_purpose::<GenericKey>("transit_receiver")
141141
.to_hex()
142142
);
143143
assert_eq!(expected_rx_handshake.len(), 89);
@@ -196,7 +196,7 @@ impl TransitCryptoInit for SecretboxInit {
196196
format!(
197197
"transit receiver {} ready\n\n",
198198
self.key
199-
.derive_subkey_from_purpose::<crate::GenericKey>("transit_receiver")
199+
.derive_subkey_from_purpose::<GenericKey>("transit_receiver")
200200
.to_hex(),
201201
)
202202
.as_bytes(),
@@ -206,7 +206,7 @@ impl TransitCryptoInit for SecretboxInit {
206206
let expected_tx_handshake = format!(
207207
"transit sender {} ready\n\ngo\n",
208208
self.key
209-
.derive_subkey_from_purpose::<crate::GenericKey>("transit_sender")
209+
.derive_subkey_from_purpose::<GenericKey>("transit_sender")
210210
.to_hex(),
211211
);
212212
assert_eq!(expected_tx_handshake.len(), 90);

0 commit comments

Comments
 (0)