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
7 changes: 4 additions & 3 deletions .github/workflows/aes-gcm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: aes-gcm
on:
pull_request:
paths:
- ".github/workflows/aes-gcm.yml"
- "aes-gcm/**"
- "Cargo.*"
push:
Expand All @@ -22,7 +23,7 @@ jobs:
strategy:
matrix:
rust:
- 1.51.0 # MSRV
- 1.56.0 # MSRV
- stable
target:
- armv7a-none-eabi
Expand All @@ -45,15 +46,15 @@ jobs:
include:
# 32-bit Linux
- target: i686-unknown-linux-gnu
rust: 1.51.0 # MSRV
rust: 1.56.0 # MSRV
deps: sudo apt update && sudo apt install gcc-multilib
- target: i686-unknown-linux-gnu
rust: stable
deps: sudo apt update && sudo apt install gcc-multilib

# 64-bit Linux
- target: x86_64-unknown-linux-gnu
rust: 1.51.0 # MSRV
rust: 1.56.0 # MSRV
- target: x86_64-unknown-linux-gnu
rust: stable
steps:
Expand Down
44 changes: 32 additions & 12 deletions Cargo.lock

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

10 changes: 5 additions & 5 deletions aes-gcm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ categories = ["cryptography", "no-std"]

[dependencies]
aead = { version = "0.4", default-features = false }
aes = { version = "0.7.5", optional = true }
cipher = "0.3"
ctr = "0.8"
aes = { version = "0.8", optional = true }
cipher = "0.4"
ctr = "0.9"
ghash = { version = "0.4.2", default-features = false }
subtle = { version = "2", default-features = false }
zeroize = { version = "1", optional = true, default-features = false }
Expand All @@ -32,8 +32,8 @@ hex-literal = "0.3"
default = ["aes", "alloc"]
std = ["aead/std", "alloc"]
alloc = ["aead/alloc"]
armv8 = ["aes/armv8", "ghash/armv8"] # nightly-only
force-soft = ["aes/force-soft", "ghash/force-soft"]
armv8 = ["ghash/armv8"] # nightly-only
force-soft = ["ghash/force-soft"]
Comment on lines -35 to +36
Copy link
Member Author

Choose a reason for hiding this comment

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

It seems unfortunate there's no longer a way to transitively toggle on support for these across crates.

The cfg-based approach seems okay, but IMO there should be a single cfg which can force soft implementations across all crates, or force nightly armv8 support, rather than having to instruct people to pass two different cfgs for both aes and ghash

heapless = ["aead/heapless"]
stream = ["aead/stream"]

Expand Down
2 changes: 1 addition & 1 deletion aes-gcm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ dual licensed as above, without any additional terms or conditions.
[docs-image]: https://docs.rs/aes-gcm/badge.svg
[docs-link]: https://docs.rs/aes-gcm/
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.49+-blue.svg
[rustc-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg
[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260038-AEADs
[downloads-image]: https://img.shields.io/crates/d/aes-gcm.svg
Expand Down
Loading