-
Notifications
You must be signed in to change notification settings - Fork 131
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Implement reused secret keys for Noise/X3DH/etc protocols #71
Merged
isislovecruft
merged 6 commits into
dalek-cryptography:develop
from
isislovecruft:feature/noise-secrets
Sep 14, 2021
Merged
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
0a1023f
Implement reused secret keys for Noise protocol.
isislovecruft 27c73fd
Feature gate reusable secrets and make the name more intuitive.
isislovecruft 3924797
Add note to StaticSecret that EphemeralSecret is recommended.
isislovecruft 588e48f
Make ReusableSecret derive Clone.
isislovecruft edb9ec9
Document that ReusableSecret is preferrable for Noise protocols.
isislovecruft eef4de4
Disambiguate what kind of key in docstring.
isislovecruft File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -95,6 +95,49 @@ impl<'a> From<&'a EphemeralSecret> for PublicKey { | |
} | ||
} | ||
|
||
/// A Diffie-Hellman secret key which may be used more than once, but is | ||
/// purposefully not serialiseable in order to discourage key-reuse. This is | ||
/// implemented to facilitate protocols such as Noise (e.g. Noise IK key usage, | ||
/// etc.) and X3DH which require an "ephemeral" key to conduct the | ||
/// Diffie-Hellman operation multiple times throughout the protocol, while the | ||
/// protocol run at a higher level is only conducted once per key. | ||
/// | ||
/// If you're uncertain about whether you should use this, then you likely | ||
/// should not be using this. Our strongly recommended advice is to use | ||
/// [`EphemeralSecret`] at all times, as that type enforces at compile-time that | ||
/// secret keys are never reused, which can have very serious security | ||
/// implications for many protocols. | ||
#[cfg(feature = "reusable_secrets")] | ||
#[derive(Zeroize)] | ||
#[zeroize(drop)] | ||
pub struct ReusableSecret(pub(crate) Scalar); | ||
|
||
#[cfg(feature = "reusable_secrets")] | ||
impl ReusableSecret { | ||
/// Perform a Diffie-Hellman key agreement between `self` and | ||
/// `their_public` key to produce a [`SharedSecret`]. | ||
pub fn diffie_hellman(&self, their_public: &PublicKey) -> SharedSecret { | ||
SharedSecret(&self.0 * their_public.0) | ||
} | ||
|
||
/// Generate a non-serializeable x25519 key. | ||
pub fn new<T: RngCore + CryptoRng>(mut csprng: T) -> Self { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. "Generate a non-serializable x25519 secret key." Either one, I just think the word "secret" needs to be somewhere because "key" is ambiguous |
||
let mut bytes = [0u8; 32]; | ||
|
||
csprng.fill_bytes(&mut bytes); | ||
|
||
ReusableSecret(clamp_scalar(bytes)) | ||
} | ||
} | ||
|
||
#[cfg(feature = "reusable_secrets")] | ||
impl<'a> From<&'a ReusableSecret> for PublicKey { | ||
/// Given an x25519 [`ReusableSecret`] key, compute its corresponding [`PublicKey`]. | ||
fn from(secret: &'a ReusableSecret) -> PublicKey { | ||
PublicKey((&ED25519_BASEPOINT_TABLE * &secret.0).to_montgomery()) | ||
} | ||
} | ||
|
||
/// A Diffie-Hellman secret key that can be used to compute multiple [`SharedSecret`]s. | ||
/// | ||
/// This type is identical to the [`EphemeralSecret`] type, except that the | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Might wanna make it
Clone
too, just for usability sake