Skip to content

Commit 9786ef1

Browse files
committed
Fix various CI complaints
1 parent 4ccf1fe commit 9786ef1

File tree

2 files changed

+19
-16
lines changed

2 files changed

+19
-16
lines changed

.github/workflows/analysis.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,9 @@ jobs:
133133
- name: Set Rust toolchain override
134134
run: rustup override set ${{ steps.toolchain.outputs.name }}
135135

136+
- name: Install valgrind
137+
run: sudo apt-get update && sudo apt-get install -y valgrind
138+
136139
- name: Install cargo-udeps
137140
run: cargo install cargo-udeps
138141

@@ -243,12 +246,14 @@ jobs:
243246
with:
244247
package: aws-lc-rs
245248
feature-group: default-features
249+
rust-toolchain: 1.90.0
246250
- name: Check semver (FIPS)
247251
uses: obi1kenobi/cargo-semver-checks-action@v2
248252
with:
249253
package: aws-lc-rs
250254
feature-group: only-explicit-features
251255
features: fips
256+
rust-toolchain: 1.90.0
252257
metadata-checks:
253258
if: github.repository_owner == 'aws'
254259
runs-on: ubuntu-latest
@@ -402,7 +407,7 @@ jobs:
402407
submodules: 'recursive'
403408
- uses: dtolnay/rust-toolchain@stable
404409
- name: Install readelf
405-
run: sudo apt-get update && sudo apt-get install -y binutils
410+
run: sudo apt-get update && sudo apt-get install -y binutils valgrind
406411
- name: Build project
407412
run: cargo build --workspace --all-targets --release
408413
- name: Check for GNU-stack section in object files

aws-lc-rs-bench/src/benchmarks.rs

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,19 @@
99
1010
use std::hint::black_box;
1111

12-
use aws_lc_rs::{
13-
aead::{
14-
Aad, BoundKey, Nonce, NonceSequence, OpeningKey, SealingKey, UnboundKey, AES_128_GCM,
15-
AES_256_GCM, CHACHA20_POLY1305, NONCE_LEN,
16-
},
17-
agreement::{self, EphemeralPrivateKey, UnparsedPublicKey, X25519},
18-
digest::{self, Context as DigestContext},
19-
error::Unspecified,
20-
hkdf::{Salt, HKDF_SHA256, HKDF_SHA384},
21-
hmac::{self, Context as HmacContext},
22-
rand::SystemRandom,
23-
signature::{
24-
self, EcdsaKeyPair, Ed25519KeyPair, KeyPair, RsaKeyPair, ECDSA_P256_SHA256_FIXED_SIGNING,
25-
ECDSA_P384_SHA384_FIXED_SIGNING, ED25519,
26-
},
12+
use aws_lc_rs::aead::{
13+
Aad, BoundKey, Nonce, NonceSequence, OpeningKey, SealingKey, UnboundKey, AES_128_GCM,
14+
AES_256_GCM, CHACHA20_POLY1305, NONCE_LEN,
15+
};
16+
use aws_lc_rs::agreement::{self, EphemeralPrivateKey, UnparsedPublicKey, X25519};
17+
use aws_lc_rs::digest::{self, Context as DigestContext};
18+
use aws_lc_rs::error::Unspecified;
19+
use aws_lc_rs::hkdf::{Salt, HKDF_SHA256, HKDF_SHA384};
20+
use aws_lc_rs::hmac::{self, Context as HmacContext};
21+
use aws_lc_rs::rand::SystemRandom;
22+
use aws_lc_rs::signature::{
23+
self, EcdsaKeyPair, Ed25519KeyPair, KeyPair, RsaKeyPair, ECDSA_P256_SHA256_FIXED_SIGNING,
24+
ECDSA_P384_SHA384_FIXED_SIGNING, ED25519,
2725
};
2826

2927
/// A benchmark definition

0 commit comments

Comments
 (0)