vexahub/opaque-vx
5
0
Fork 0
Code Issues 1 Pull Requests 3 Actions Releases 3 Activity

Bump curve25519-dalek to v4.0.0-rc.3 (#330)

Browse Source
This commit is contained in:
daxpedda
2023-06-29 11:51:40 -07:00
committed by GitHub
parent bca1abfe42
commit 4487f11f87
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.toml
+2 -2
View File
@@ -24,7 +24,7 @@ std = ["dep:getrandom"]
argon2 = { version = "0.5", default-features = false, features = [ argon2 = { version = "0.5", default-features = false, features = [
"alloc", "alloc",
], optional = true } ], optional = true }
curve25519-dalek = { version = "=4.0.0-rc.2", default-features = false, features = [ curve25519-dalek = { version = "=4.0.0-rc.3", default-features = false, features = [
"zeroize", "zeroize",
], optional = true } ], optional = true }
derive-where = { version = "1", features = ["zeroize-on-drop"] } derive-where = { version = "1", features = ["zeroize-on-drop"] }
@@ -39,7 +39,7 @@ serde = { version = "1", default-features = false, features = [
"derive", "derive",
], optional = true } ], optional = true }
subtle = { version = "2.3", default-features = false } subtle = { version = "2.3", default-features = false }
voprf = { version = "=0.5.0-pre.4", default-features = false, features = [ voprf = { version = "=0.5.0-pre.5", default-features = false, features = [
"danger", "danger",
] } ] }
zeroize = { version = "1.5", features = ["zeroize_derive"] } zeroize = { version = "1.5", features = ["zeroize_derive"] }
src/key_exchange/group/curve25519.rs
+12 -13
View File
@@ -8,9 +8,8 @@
//! Key Exchange group implementation for Curve25519 //! Key Exchange group implementation for Curve25519
use curve25519_dalek::constants::X25519_BASEPOINT;
use curve25519_dalek::montgomery::MontgomeryPoint; use curve25519_dalek::montgomery::MontgomeryPoint;
use curve25519_dalek::scalar::Scalar; use curve25519_dalek::scalar::{self, Scalar};
use curve25519_dalek::traits::Identity; use curve25519_dalek::traits::Identity;
use digest::core_api::BlockSizeUser; use digest::core_api::BlockSizeUser;
use digest::{FixedOutput, HashMarker, OutputSizeUser}; use digest::{FixedOutput, HashMarker, OutputSizeUser};
@@ -29,7 +28,7 @@ pub struct Curve25519;
impl KeGroup for Curve25519 { impl KeGroup for Curve25519 {
type Pk = MontgomeryPoint; type Pk = MontgomeryPoint;
type PkLen = U32; type PkLen = U32;
type Sk = Scalar; type Sk = [u8; 32];
type SkLen = U32; type SkLen = U32;
fn serialize_pk(pk: Self::Pk) -> GenericArray<u8, Self::PkLen> { fn serialize_pk(pk: Self::Pk) -> GenericArray<u8, Self::PkLen> {
@@ -50,9 +49,9 @@ impl KeGroup for Curve25519 {
// Sample 32 random bytes and then clamp, as described in https://cr.yp.to/ecdh.html // Sample 32 random bytes and then clamp, as described in https://cr.yp.to/ecdh.html
let mut scalar_bytes = [0u8; 32]; let mut scalar_bytes = [0u8; 32];
rng.fill_bytes(&mut scalar_bytes); rng.fill_bytes(&mut scalar_bytes);
let scalar = Scalar::from_bits_clamped(scalar_bytes); let scalar = scalar::clamp_integer(scalar_bytes);
if scalar != Scalar::ZERO { if scalar != Scalar::ZERO.to_bytes() {
break scalar; break scalar;
} }
} }
@@ -73,23 +72,23 @@ impl KeGroup for Curve25519 {
<CS::Hash as OutputSizeUser>::OutputSize: <CS::Hash as OutputSizeUser>::OutputSize:
IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>, IsLess<U256> + IsLessOrEqual<<CS::Hash as BlockSizeUser>::BlockSize>,
{ {
Ok(Scalar::from_bits_clamped(seed.into())) Ok(scalar::clamp_integer(seed.into()))
} }
fn is_zero_scalar(scalar: Self::Sk) -> subtle::Choice { fn is_zero_scalar(scalar: Self::Sk) -> subtle::Choice {
scalar.ct_eq(&Scalar::ZERO) scalar.ct_eq(&Scalar::ZERO.to_bytes())
} }
fn public_key(sk: Self::Sk) -> Self::Pk { fn public_key(sk: Self::Sk) -> Self::Pk {
X25519_BASEPOINT * sk MontgomeryPoint::mul_base_clamped(sk)
} }
fn diffie_hellman(pk: Self::Pk, sk: Self::Sk) -> GenericArray<u8, Self::PkLen> { fn diffie_hellman(pk: Self::Pk, sk: Self::Sk) -> GenericArray<u8, Self::PkLen> {
Self::serialize_pk(sk * pk) Self::serialize_pk(pk.mul_clamped(sk))
} }
fn serialize_sk(sk: Self::Sk) -> GenericArray<u8, Self::SkLen> { fn serialize_sk(sk: Self::Sk) -> GenericArray<u8, Self::SkLen> {
sk.to_bytes().into() sk.into()
} }
fn deserialize_sk(bytes: &[u8]) -> Result<Self::Sk, InternalError> { fn deserialize_sk(bytes: &[u8]) -> Result<Self::Sk, InternalError> {
@@ -97,10 +96,10 @@ impl KeGroup for Curve25519 {
.try_into() .try_into()
.ok() .ok()
.and_then(|bytes| { .and_then(|bytes| {
let scalar = Scalar::from_bits_clamped(bytes); let scalar = scalar::clamp_integer(bytes);
(scalar.as_bytes() == &bytes).then_some(scalar) (scalar == bytes).then_some(scalar)
}) })
.filter(|scalar| scalar != &Scalar::ZERO) .filter(|scalar| scalar != &Scalar::ZERO.to_bytes())
.ok_or(InternalError::PointError) .ok_or(InternalError::PointError)
} }
} }