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
69 changes: 35 additions & 34 deletions .github/workflows/benches.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1,35 @@
name: benches

on:
pull_request:
paths:
- "benches/**"
- "Cargo.*"
push:
branches: master

defaults:
run:
working-directory: benches

env:
CARGO_INCREMENTAL: 0
RUSTFLAGS: "-Dwarnings"

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
rust:
- 1.41.0 # MSRV
- stable
steps:
- uses: actions/checkout@v1
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: ${{ matrix.rust }}
override: true
- run: cargo build --release
# TODO(tarcieri): re-enable after UHFs are bumped
#name: benches
#
#on:
# pull_request:
# paths:
# - "benches/**"
# - "Cargo.*"
# push:
# branches: master
#
#defaults:
# run:
# working-directory: benches
#
#env:
# CARGO_INCREMENTAL: 0
# RUSTFLAGS: "-Dwarnings"
#
#jobs:
# build:
# runs-on: ubuntu-latest
# strategy:
# matrix:
# rust:
# - 1.41.0 # MSRV
# - stable
# steps:
# - uses: actions/checkout@v1
# - uses: actions-rs/toolchain@v1
# with:
# profile: minimal
# toolchain: ${{ matrix.rust }}
# override: true
# - run: cargo build --release
49 changes: 25 additions & 24 deletions .github/workflows/security-audit.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
name: Security Audit
on:
pull_request:
paths: Cargo.lock
push:
branches: master
paths: Cargo.lock
schedule:
- cron: "0 0 * * *"

jobs:
security_audit:
name: Security Audit
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Cache cargo bin
uses: actions/cache@v1
with:
path: ~/.cargo/bin
key: ${{ runner.os }}-cargo-audit-v0.12
- uses: actions-rs/audit-check@v1
with:
token: ${{ secrets.GITHUB_TOKEN }}
# TODO(tarcieri): re-enable after UHFs are bumped
#name: Security Audit
#on:
# pull_request:
# paths: Cargo.lock
# push:
# branches: master
# paths: Cargo.lock
# schedule:
# - cron: "0 0 * * *"
#
#jobs:
# security_audit:
# name: Security Audit
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v1
# - name: Cache cargo bin
# uses: actions/cache@v1
# with:
# path: ~/.cargo/bin
# key: ${{ runner.os }}-cargo-audit-v0.12
# - uses: actions-rs/audit-check@v1
# with:
# token: ${{ secrets.GITHUB_TOKEN }}
21 changes: 14 additions & 7 deletions Cargo.lock

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

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ members = [
]

[patch.crates-io]
aes = { git = "https://github.com/RustCrypto/block-ciphers.git" }
chacha20 = { git = "https://github.com/RustCrypto/stream-ciphers.git" }
cmac = { git = "https://github.com/RustCrypto/MACs.git" }
ghash = { git = "https://github.com/RustCrypto/universal-hashes.git" }
Expand Down
4 changes: 2 additions & 2 deletions aes-gcm-siv/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.0-pre", optional = true }
aes = { version = "0.7", optional = true }
cipher = "0.3"
ctr = "=0.7.0-pre.4"
ctr = "0.7"
polyval = { version = "=0.5.0-pre", default-features = false }
subtle = { version = "2", default-features = false }
zeroize = { version = "1", default-features = false }
Expand Down
4 changes: 2 additions & 2 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.0-pre", optional = true }
aes = { version = "0.7", optional = true }
cipher = "0.3"
ctr = "=0.7.0-pre.4"
ctr = "0.7"
ghash = { version = "=0.4.0-pre", default-features = false }
subtle = { version = "2", default-features = false }
zeroize = { version = "1", optional = true, default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions aes-siv/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ categories = ["cryptography", "no-std"]

[dependencies]
aead = "0.4"
aes = "=0.7.0-pre"
aes = "0.7"
cipher = "0.3"
cmac = "=0.6.0-pre"
crypto-mac = "0.11"
ctr = "=0.7.0-pre.4"
ctr = "0.7"
dbl = "0.3"
pmac = "=0.6.0-pre"
zeroize = { version = "1", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion ccm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ subtle = { version = "2", default-features = false }

[dev-dependencies]
aead = { version = "0.4", features = ["dev"], default-features = false }
aes = { version = "=0.7.0-pre", features = ["force-soft"] } # Uses `force-soft` for MSRV 1.41
aes = { version = "0.7", features = ["force-soft"] } # Uses `force-soft` for MSRV 1.41
hex-literal = "0.2"

[features]
Expand Down
4 changes: 2 additions & 2 deletions eax/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ categories = ["cryptography", "no-std"]
aead = { version = "0.4", default-features = false }
cipher = "0.3"
cmac = "=0.6.0-pre"
ctr = "=0.7.0-pre.4"
ctr = "0.7"
subtle = { version = "2", default-features = false }

[dev-dependencies]
aead = { version = "0.4", features = ["dev"], default-features = false }
aes = { version = "=0.7.0-pre", features = ["force-soft"] } # Uses `force-soft` for MSRV 1.41
aes = { version = "0.7", features = ["force-soft"] } # Uses `force-soft` for MSRV 1.41

[features]
default = ["alloc"]
Expand Down