Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Bump dalek dependencies #176

Merged
merged 7 commits into from
Sep 29, 2023
Merged

Bump dalek dependencies #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
88c5a17
Update curve25519-dalek requirement from 3 to 4
dependabot[bot] Aug 11, 2023
9bd98b3
Update x25519-dalek requirement from 1 to 2
dependabot[bot] Sep 4, 2023
59b0a8e
bump dependencies: x25519-dalek's backend is now autoselect
commial Sep 4, 2023
a0bf0d6
CompressedEdwardsY now returns a Result
commial Sep 7, 2023
5744ba8
bump dependencies: StaticSecret is now a feature
commial Sep 7, 2023
050f9fc
Refactor parse_openssl_25519_pubkey_der
Sep 8, 2023
a444ed5
Fix missing zeroize feature for x25519-dalek in mla lib
Sep 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions curve25519-parser/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ readme = "../README.md"

[dependencies]
der-parser = { version = "8", default-features = false}
x25519-dalek = { version = "1", default-features = false}
curve25519-dalek = { version = "3", default-features = false, features = ["u64_backend"]}
curve25519-dalek = { version = "4", default-features = false}
x25519-dalek = { version = "2", default-features = false, features=["static_secrets"]}
sha2 = { version = "0", default-features = false}
pem = { version = "3", default-features = false}

Expand Down
10 changes: 5 additions & 5 deletions curve25519-parser/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,11 +211,11 @@ pub fn parse_openssl_25519_pubkey_der(data: &[u8]) -> Result<PublicKey, Curve255
.map_err(|_| Curve25519ParserError::InvalidData)?;
let read_oid = ed25519_public.header.tag.as_oid()?;
if read_oid == &ED_25519_OID {
if let Some(edwards_val) = CompressedEdwardsY::from_slice(&data).decompress() {
Ok(PublicKey::from(edwards_val.to_montgomery().to_bytes()))
} else {
Err(Curve25519ParserError::InvalidData)
}
CompressedEdwardsY::from_slice(&data)
.ok()
.and_then(|c| c.decompress())
.map(|v| PublicKey::from(v.to_montgomery().to_bytes()))
.ok_or(Curve25519ParserError::InvalidData)
} else if read_oid == &X_25519_OID {
Ok(PublicKey::from(MontgomeryPoint(data).to_bytes()))
} else {
Expand Down
6 changes: 2 additions & 4 deletions mla/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ ctr = { version = "0.9", default-features = false}
subtle = { version = "2", default-features = false}
digest = { version = "0", default-features = false}
# ECC
x25519-dalek = { version = "1", default-features = false}
x25519-dalek = { version = "2", default-features = false, features = ["zeroize"]}
hkdf = { version = "0", default-features = false}
sha2 = { version = "0", default-features = false}
zeroize = { version = "1", default-features = false}
Expand All @@ -44,9 +44,7 @@ hex = { version = "0.4", default-features = false, features = ["alloc"]}
static_assertions = { version = "1", default-features = false }

[features]
# x25519-dalek depends on curve25519-dalek, which requires at least one feature to be enabled
# -> use default u64_backend (x25519-dalek's default) to have a working default compilation
default = ["x25519-dalek/u64_backend"]
default = []
send = []

[[bench]]
Expand Down
2 changes: 1 addition & 1 deletion mlar/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ glob = "0.3"
mla = { path = "../mla", version = "1" }
curve25519-parser = { path = "../curve25519-parser", version = "0.3" }
rand = "0.8"
x25519-dalek = "1"
x25519-dalek = "2"
humansize = {version = "2", features = ["impl_style"]}
hex = "0.4"
sha2 = { version = "0", default-features = false}
Expand Down
Loading