Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .cargo/audit.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[advisories]
ignore = [
"RUSTSEC-2023-0037", # xsalsa20poly1305 unmaintained
"RUSTSEC-2026-0385", # Patched versions of ctutils require Rust 1.87

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tarcieri
WDYT about this workaround? I think it's fine to do this until we sort out MSRV testing.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd generally recommend upgrading ctutils though if it isn't actually impacting constant time codegen here this is fine

]
informational_warnings = ["unmaintained", "unsound"]
1 change: 0 additions & 1 deletion .github/workflows/mgm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,4 @@ jobs:
- run: cargo test --release --no-default-features
- run: cargo test --release
- run: cargo test --release --features force-soft
- run: cargo test --release --features stream,std
- run: RUSTFLAGS="-C target-cpu=native" cargo test --release --all-features
37 changes: 35 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ members = [
"chacha20poly1305",
"deoxys",
"eax",
"mgm",
"ocb3",
"xaes-256-gcm",
]
Expand Down
10 changes: 10 additions & 0 deletions mgm/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 0.5.0 (UNRELEASED)
### Changed
- Bump `aead` to v0.6, `cipher` to v0.5, and `cpufeatures` to v0.3 ([#891])
- Edition changed to 2024 and MSRV bumped to 1.85 ([#891])

### Removed
- `std` and `stream` features ([#891])

[#891]: https://github.com/RustCrypto/AEADs/pull/891

## 0.4.6 (2021-09-01)
### Added
- Target feature autodetection on x86(-64) targets ([#371])
Expand Down
183 changes: 0 additions & 183 deletions mgm/Cargo.lock

This file was deleted.

24 changes: 13 additions & 11 deletions mgm/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
[workspace]

[package]
name = "mgm"
version = "0.5.0-pre.1"
Expand All @@ -16,27 +14,31 @@ keywords = ["encryption", "aead"]
rust-version = "1.85"

[dependencies]
aead = { version = "0.5", default-features = false }
cipher = "0.3"
aead = { version = "0.6", default-features = false }
cipher = "0.5"
cfg-if = "1"
ctutils = "0.4"

[target.'cfg(any(target_arch = "x86_64", target_arch = "x86"))'.dependencies]
cpufeatures = "0.2"
cpufeatures = "0.3.1"

[dev-dependencies]
aead = { version = "0.5", features = ["dev"], default-features = false }
kuznyechik = "0.7"
magma = "0.7"
aead = { version = "0.6", features = ["dev"], default-features = false }
kuznyechik = "0.9"
magma = "0.10"
hex-literal = "1"

[features]
default = ["alloc", "getrandom"]
std = ["aead/std", "alloc"]
alloc = ["aead/alloc"]
arrayvec = ["aead/arrayvec"]
bytes = ["aead/bytes"]
getrandom = ["aead/getrandom", "rand_core"]
getrandom = ["aead/getrandom"]
rand_core = ["aead/rand_core"]
stream = ["aead/stream"]
force-soft = [] # Disable support for hardware intrinsics

[package.metadata.docs.rs]
all-features = true

[lints]
workspace = true
Loading
Loading