Skip to content

Commit 6a0d57e

Browse files
ctzctz
committed
rustfmt: style_edition 2024
1 parent fd84f5f commit 6a0d57e

33 files changed

+84
-72
lines changed

‎.github/workflows/lints.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- name: Install nightly toolchain
5353
uses: dtolnay/rust-toolchain@master
5454
with:
55-
toolchain: nightly-2024-12-03
55+
toolchain: nightly-2025-02-14
5656
components: rustfmt
5757

5858
- name: clippy
@@ -62,7 +62,7 @@ jobs:
6262
run: cargo +stable fmt --check
6363

6464
- name: rustfmt (nightly)
65-
run: cargo +nightly-2024-12-03 fmt --check -- --config-path=.rustfmt.unstable.toml
65+
run: cargo +nightly-2025-02-14 fmt --check -- --config-path=.rustfmt.unstable.toml
6666

6767
- name: check codegen
6868
working-directory: admin/parse-asm

‎.rustfmt.toml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
style_edition = "2024"

‎.rustfmt.unstable.toml

+1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
style_edition = "2024"
12
group_imports = "StdExternalCrate"
23
format_code_in_doc_comments = true

‎graviola-bench/benches/aes_gcm.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
mod criterion;
2-
use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
2+
use criterion::{BenchmarkId, Criterion, Throughput, criterion_group, criterion_main};
33

44
fn test_ring_aes_gcm(key: &ring::aead::LessSafeKey, nonce: &[u8; 12], aad: &[u8], plain: &[u8]) {
55
let mut ct = plain.to_vec();
@@ -57,7 +57,7 @@ fn aes128_gcm(c: &mut Criterion) {
5757
group.throughput(Throughput::Bytes(size as u64));
5858

5959
group.bench_with_input(BenchmarkId::new("ring", size_name), &input, |b, input| {
60-
use ring::aead::{LessSafeKey, UnboundKey, AES_128_GCM};
60+
use ring::aead::{AES_128_GCM, LessSafeKey, UnboundKey};
6161
let key = UnboundKey::new(&AES_128_GCM, &key).unwrap();
6262
let key = LessSafeKey::new(key);
6363
b.iter(|| test_ring_aes_gcm(&key, &nonce, &aad, input));
@@ -66,7 +66,7 @@ fn aes128_gcm(c: &mut Criterion) {
6666
BenchmarkId::new("aws-lc-rs", size_name),
6767
&input,
6868
|b, input| {
69-
use aws_lc_rs::aead::{LessSafeKey, UnboundKey, AES_128_GCM};
69+
use aws_lc_rs::aead::{AES_128_GCM, LessSafeKey, UnboundKey};
7070
let key = UnboundKey::new(&AES_128_GCM, &key).unwrap();
7171
let key = LessSafeKey::new(key);
7272
b.iter(|| test_aws_aes_gcm(&key, &nonce, &aad, input));
@@ -103,7 +103,7 @@ fn aes256_gcm(c: &mut Criterion) {
103103
group.throughput(Throughput::Bytes(size as u64));
104104

105105
group.bench_with_input(BenchmarkId::new("ring", size_name), &input, |b, input| {
106-
use ring::aead::{LessSafeKey, UnboundKey, AES_256_GCM};
106+
use ring::aead::{AES_256_GCM, LessSafeKey, UnboundKey};
107107
let key = UnboundKey::new(&AES_256_GCM, &key).unwrap();
108108
let key = LessSafeKey::new(key);
109109
b.iter(|| test_ring_aes_gcm(&key, &nonce, &aad, input));
@@ -112,7 +112,7 @@ fn aes256_gcm(c: &mut Criterion) {
112112
BenchmarkId::new("aws-lc-rs", size_name),
113113
&input,
114114
|b, input| {
115-
use aws_lc_rs::aead::{LessSafeKey, UnboundKey, AES_256_GCM};
115+
use aws_lc_rs::aead::{AES_256_GCM, LessSafeKey, UnboundKey};
116116
let key = UnboundKey::new(&AES_256_GCM, &key).unwrap();
117117
let key = LessSafeKey::new(key);
118118
b.iter(|| test_aws_aes_gcm(&key, &nonce, &aad, input));

‎graviola-bench/benches/chacha20poly1305.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
mod criterion;
2-
use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
2+
use criterion::{BenchmarkId, Criterion, Throughput, criterion_group, criterion_main};
33

44
fn test_ring_chacha(key: &ring::aead::LessSafeKey, nonce: &[u8; 12], aad: &[u8], plain: &[u8]) {
55
let mut ct = plain.to_vec();
@@ -54,7 +54,7 @@ fn bench_chacha20poly1305(c: &mut Criterion) {
5454
group.throughput(Throughput::Bytes(size as u64));
5555

5656
group.bench_with_input(BenchmarkId::new("ring", size_name), &input, |b, input| {
57-
use ring::aead::{LessSafeKey, UnboundKey, CHACHA20_POLY1305};
57+
use ring::aead::{CHACHA20_POLY1305, LessSafeKey, UnboundKey};
5858
let key = UnboundKey::new(&CHACHA20_POLY1305, &key).unwrap();
5959
let key = LessSafeKey::new(key);
6060
b.iter(|| test_ring_chacha(&key, &nonce, &aad, input));
@@ -63,7 +63,7 @@ fn bench_chacha20poly1305(c: &mut Criterion) {
6363
BenchmarkId::new("aws-lc-rs", size_name),
6464
&input,
6565
|b, input| {
66-
use aws_lc_rs::aead::{LessSafeKey, UnboundKey, CHACHA20_POLY1305};
66+
use aws_lc_rs::aead::{CHACHA20_POLY1305, LessSafeKey, UnboundKey};
6767
let key = UnboundKey::new(&CHACHA20_POLY1305, &key).unwrap();
6868
let key = LessSafeKey::new(key);
6969
b.iter(|| test_aws_chacha(&key, &nonce, &aad, input));

‎graviola-bench/benches/hmac.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
mod criterion;
2-
use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
2+
use criterion::{BenchmarkId, Criterion, Throughput, black_box, criterion_group, criterion_main};
33
use hmac::Mac;
44

55
fn test_ring_sha256(key: &[u8], data: &[u8]) {

‎graviola-bench/benches/p256.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
mod criterion;
2-
use criterion::{black_box, criterion_group, criterion_main, Criterion, Throughput};
2+
use criterion::{Criterion, Throughput, black_box, criterion_group, criterion_main};
33

44
const PUBLIC_KEY: &[u8; 65] = b"\x04\
55
\x62\xd5\xbd\x33\x72\xaf\x75\xfe\x85\xa0\x40\x71\x5d\x0f\x50\x24\x28\xe0\x70\x46\x86\x8b\x0b\xfd\xfa\x61\xd7\x31\xaf\xe4\x4f\x26\
@@ -80,8 +80,8 @@ fn ecdh(c: &mut Criterion) {
8080
});
8181

8282
group.bench_function("p256-rustcrypto", |b| {
83-
use p256::ecdh::EphemeralSecret;
8483
use p256::PublicKey;
84+
use p256::ecdh::EphemeralSecret;
8585

8686
b.iter(|| {
8787
let our_private_key = EphemeralSecret::random(&mut rand_core::OsRng);
@@ -193,7 +193,7 @@ fn ecdsa_verify(c: &mut Criterion) {
193193
});
194194

195195
group.bench_function("rustcrypto", |b| {
196-
use p256::ecdsa::{signature::Verifier, Signature, VerifyingKey};
196+
use p256::ecdsa::{Signature, VerifyingKey, signature::Verifier};
197197
let verifying_key = VerifyingKey::from_sec1_bytes(public_key).unwrap();
198198

199199
b.iter(|| {
@@ -262,7 +262,7 @@ fn ecdsa_sign(c: &mut Criterion) {
262262
});
263263

264264
group.bench_function("rustcrypto", |b| {
265-
use p256::ecdsa::{signature::Signer, Signature, SigningKey};
265+
use p256::ecdsa::{Signature, SigningKey, signature::Signer};
266266
let signing_key = SigningKey::random(&mut rand_core::OsRng);
267267

268268
b.iter(|| {
@@ -273,7 +273,7 @@ fn ecdsa_sign(c: &mut Criterion) {
273273

274274
group.bench_function("graviola", |b| {
275275
use graviola::hashing::Sha256;
276-
use graviola::signing::ecdsa::{Curve, SigningKey, P256};
276+
use graviola::signing::ecdsa::{Curve, P256, SigningKey};
277277
let private_key = <P256 as Curve>::PrivateKey::new_random().unwrap();
278278
let signing_key = SigningKey::<P256> { private_key };
279279

‎graviola-bench/benches/p384.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
mod criterion;
2-
use criterion::{black_box, criterion_group, criterion_main, Criterion, Throughput};
2+
use criterion::{Criterion, Throughput, black_box, criterion_group, criterion_main};
33

44
const PUBLIC_KEY: &[u8; 97] = &[
55
0x04, 0x7a, 0x6e, 0xc8, 0xd3, 0x11, 0xd5, 0xca, 0x58, 0x8b, 0xae, 0xd4, 0x1b, 0xe3, 0xe9, 0x8f,
@@ -60,8 +60,8 @@ fn ecdh(c: &mut Criterion) {
6060
});
6161

6262
group.bench_function("p384-rustcrypto", |b| {
63-
use p384::ecdh::EphemeralSecret;
6463
use p384::PublicKey;
64+
use p384::ecdh::EphemeralSecret;
6565

6666
b.iter(|| {
6767
let our_private_key = EphemeralSecret::random(&mut rand_core::OsRng);
@@ -177,7 +177,7 @@ fn ecdsa_verify(c: &mut Criterion) {
177177
});
178178

179179
group.bench_function("rustcrypto", |b| {
180-
use p384::ecdsa::{signature::Verifier, Signature, VerifyingKey};
180+
use p384::ecdsa::{Signature, VerifyingKey, signature::Verifier};
181181
let verifying_key = VerifyingKey::from_sec1_bytes(public_key).unwrap();
182182

183183
b.iter(|| {
@@ -246,7 +246,7 @@ fn ecdsa_sign(c: &mut Criterion) {
246246
});
247247

248248
group.bench_function("rustcrypto", |b| {
249-
use p384::ecdsa::{signature::Signer, Signature, SigningKey};
249+
use p384::ecdsa::{Signature, SigningKey, signature::Signer};
250250
let signing_key = SigningKey::random(&mut rand_core::OsRng);
251251

252252
b.iter(|| {
@@ -257,7 +257,7 @@ fn ecdsa_sign(c: &mut Criterion) {
257257

258258
group.bench_function("graviola", |b| {
259259
use graviola::hashing::Sha384;
260-
use graviola::signing::ecdsa::{Curve, SigningKey, P384};
260+
use graviola::signing::ecdsa::{Curve, P384, SigningKey};
261261
let private_key = <P384 as Curve>::PrivateKey::new_random().unwrap();
262262
let signing_key = SigningKey::<P384> { private_key };
263263

‎graviola-bench/benches/rsa_priv.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
mod criterion;
2-
use criterion::{black_box, criterion_group, criterion_main, Criterion, Throughput};
2+
use criterion::{Criterion, Throughput, black_box, criterion_group, criterion_main};
33

44
fn rsa2048_pkcs1_sha256_sign(c: &mut Criterion) {
55
let private_key = include_bytes!("../../graviola/src/high/rsa/rsa2048.der");

‎graviola-bench/benches/rsa_pub.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
mod criterion;
2-
use criterion::{black_box, criterion_group, criterion_main, Criterion, Throughput};
2+
use criterion::{Criterion, Throughput, black_box, criterion_group, criterion_main};
33

44
fn rsa2048_pkcs1_sha256_verify(c: &mut Criterion) {
55
let public_key = b"\x30\x82\x01\x0a\x02\x82\x01\x01\x00\xa2\xb4\x51\xa0\x7d\x0a\xa5\xf9\x6e\x45\x56\x71\x51\x35\x50\x51\x4a\x8a\x5b\x46\x2e\xbe\xf7\x17\x09\x4f\xa1\xfe\xe8\x22\x24\xe6\x37\xf9\x74\x6d\x3f\x7c\xaf\xd3\x18\x78\xd8\x03\x25\xb6\xef\x5a\x17\x00\xf6\x59\x03\xb4\x69\x42\x9e\x89\xd6\xea\xc8\x84\x50\x97\xb5\xab\x39\x31\x89\xdb\x92\x51\x2e\xd8\xa7\x71\x1a\x12\x53\xfa\xcd\x20\xf7\x9c\x15\xe8\x24\x7f\x3d\x3e\x42\xe4\x6e\x48\xc9\x8e\x25\x4a\x2f\xe9\x76\x53\x13\xa0\x3e\xff\x8f\x17\xe1\xa0\x29\x39\x7a\x1f\xa2\x6a\x8d\xce\x26\xf4\x90\xed\x81\x29\x96\x15\xd9\x81\x4c\x22\xda\x61\x04\x28\xe0\x9c\x7d\x96\x58\x59\x42\x66\xf5\xc0\x21\xd0\xfc\xec\xa0\x8d\x94\x5a\x12\xbe\x82\xde\x4d\x1e\xce\x6b\x4c\x03\x14\x5b\x5d\x34\x95\xd4\xed\x54\x11\xeb\x87\x8d\xaf\x05\xfd\x7a\xfc\x3e\x09\xad\xa0\xf1\x12\x64\x22\xf5\x90\x97\x5a\x19\x69\x81\x6f\x48\x69\x8b\xcb\xba\x1b\x4d\x9c\xae\x79\xd4\x60\xd8\xf9\xf8\x5e\x79\x75\x00\x5d\x9b\xc2\x2c\x4e\x5a\xc0\xf7\xc1\xa4\x5d\x12\x56\x9a\x62\x80\x7d\x3b\x9a\x02\xe5\xa5\x30\xe7\x73\x06\x6f\x45\x3d\x1f\x5b\x4c\x2e\x9c\xf7\x82\x02\x83\xf7\x42\xb9\xd5\x02\x03\x01\x00\x01";

‎graviola-bench/benches/sha2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
mod criterion;
2-
use criterion::{black_box, criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
2+
use criterion::{BenchmarkId, Criterion, Throughput, black_box, criterion_group, criterion_main};
33
use sha2::Digest;
44

55
fn test_ring_sha256(data: &[u8]) {

‎graviola-bench/benches/x25519.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
mod criterion;
2-
use criterion::{black_box, criterion_group, criterion_main, Criterion, Throughput};
2+
use criterion::{Criterion, Throughput, black_box, criterion_group, criterion_main};
33

44
const PUBLIC_KEY: &[u8; 32] = b"\xe6\xdb\x68\x67\x58\x30\x30\xdb\x35\x94\xc1\xa4\x24\xb1\x5f\x7c\x72\x66\x24\xec\x26\xb3\x35\x3b\x10\xa9\x03\xa6\xd0\xab\x1c\x4c";
55

‎graviola-bench/benches/xchacha20poly1305.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
mod criterion;
2-
use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion, Throughput};
2+
use criterion::{BenchmarkId, Criterion, Throughput, criterion_group, criterion_main};
33

44
fn test_rc_chacha(
55
key: &chacha20poly1305::XChaCha20Poly1305,

‎graviola/src/high/asn1/pkix.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ asn1_struct! {
8080
#[cfg(test)]
8181
mod tests {
8282
use super::*;
83-
use crate::high::asn1::{oid, Any, Encoder, Error, Integer, Null, Parser, Type};
83+
use crate::high::asn1::{Any, Encoder, Error, Integer, Null, Parser, Type, oid};
8484

8585
#[test]
8686
fn parse_public_key() {

‎graviola/src/high/curve.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// Written for Graviola by Joe Birr-Pixton, 2024.
22
// SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT-0
33

4+
use crate::Error;
45
use crate::high::asn1;
56
use crate::mid::p256;
67
use crate::mid::p384;
78
use crate::mid::rng::RandomSource;
8-
use crate::Error;
99

1010
/// A generalisation of elliptic curves for use with ECDSA.
1111
pub trait Curve: private::Sealed {

‎graviola/src/high/ecdsa.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33

44
use super::asn1::{self, Type};
55
use super::curve::{
6-
Curve, PrivateKey, PublicKey, Scalar, MAX_SCALAR_LEN, MAX_UNCOMPRESSED_PUBLIC_KEY_LEN,
6+
Curve, MAX_SCALAR_LEN, MAX_UNCOMPRESSED_PUBLIC_KEY_LEN, PrivateKey, PublicKey, Scalar,
77
};
88
use super::hash::{Hash, HashContext};
99
use super::hmac_drbg::HmacDrbg;
1010
use super::pkcs8;
1111
use crate::error::{Error, KeyFormatError};
12-
use crate::low::{zeroise, Entry};
12+
use crate::low::{Entry, zeroise};
1313
use crate::mid::rng::{RandomSource, SystemRandom};
1414

1515
/// An ECDSA signing key, on curve `C`.

‎graviola/src/high/hmac_drbg.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ use core::marker::PhantomData;
55

66
use super::hash::{Hash, HashOutput};
77
use super::hmac::Hmac;
8-
use crate::mid::rng::RandomSource;
98
use crate::Error;
9+
use crate::mid::rng::RandomSource;
1010

1111
/// A limited implementation of SP800-90A -- enough for RFC6979 ECDSA.
1212
pub(crate) struct HmacDrbg<H: Hash> {

‎graviola/src/high/pkcs1.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT-0
33

44
use super::hash::{Hash, HashContext};
5-
use crate::mid::rng::RandomSource;
65
use crate::Error;
6+
use crate::mid::rng::RandomSource;
77

88
/// This is EMSA-PKCS1-v1_5-ENCODE
99
///
@@ -246,7 +246,7 @@ fn mgf1_xor<H: Hash>(seed: &[u8], h_len: usize, out: &mut [u8]) {
246246
#[cfg(test)]
247247
mod tests {
248248
use super::*;
249-
use crate::high::asn1::{self, oid, pkix, Type};
249+
use crate::high::asn1::{self, Type, oid, pkix};
250250
use crate::high::hash;
251251
use crate::mid::rng::SliceRandomSource;
252252

‎graviola/src/high/rsa.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// Written for Graviola by Joe Birr-Pixton, 2024.
22
// SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT-0
33

4-
use crate::high::asn1::{self, pkix, Type};
4+
use crate::Error;
5+
use crate::high::asn1::{self, Type, pkix};
56
use crate::high::hash::{self, Hash};
67
use crate::high::{pkcs1, pkcs8};
7-
use crate::low::zeroise;
88
use crate::low::Entry;
99
use crate::low::PosInt;
10+
use crate::low::zeroise;
1011
use crate::mid::rng::SystemRandom;
1112
use crate::mid::{rsa_priv, rsa_pub};
12-
use crate::Error;
1313

1414
/// An RSA verification public key.
1515
///

‎graviola/src/low/aarch64/aes_gcm.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// Written for Graviola by Joe Birr-Pixton, 2024.
22
// SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT-0
33

4-
use crate::low::ghash::Ghash;
54
use crate::low::AesKey;
5+
use crate::low::ghash::Ghash;
66

77
pub(crate) fn encrypt(
88
key: &AesKey,

‎graviola/src/low/posint.rs

+16-10
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
use core::ops::{Deref, DerefMut};
55

6-
use crate::low;
76
use crate::Error;
7+
use crate::low;
88

99
#[derive(Clone, Debug)]
1010
pub(crate) struct PosInt<const N: usize> {
@@ -598,19 +598,25 @@ mod tests {
598598
#[test]
599599
fn from_bytes() {
600600
// no bytes -> zero
601-
assert!(PosInt::<1>::from_bytes(&[])
602-
.unwrap()
603-
.pub_equals(&PosInt::<1>::zero()));
601+
assert!(
602+
PosInt::<1>::from_bytes(&[])
603+
.unwrap()
604+
.pub_equals(&PosInt::<1>::zero())
605+
);
604606

605607
// from single zero byte
606-
assert!(PosInt::<1>::from_bytes(&[0])
607-
.unwrap()
608-
.pub_equals(&PosInt::<1>::zero()));
608+
assert!(
609+
PosInt::<1>::from_bytes(&[0])
610+
.unwrap()
611+
.pub_equals(&PosInt::<1>::zero())
612+
);
609613

610614
// can parse exactly 8N bytes
611-
assert!(PosInt::<1>::from_bytes(&[0; 8])
612-
.unwrap()
613-
.pub_equals(&PosInt::<1>::zero()));
615+
assert!(
616+
PosInt::<1>::from_bytes(&[0; 8])
617+
.unwrap()
618+
.pub_equals(&PosInt::<1>::zero())
619+
);
614620

615621
// cannot parse > 8N bytes (excluding leading zeroes)
616622
assert_eq!(

‎graviola/src/mid/aes_gcm.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Written for Graviola by Joe Birr-Pixton, 2024.
22
// SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT-0
33

4-
use crate::low::ghash::{Ghash, GhashTable};
5-
use crate::low::{aes_gcm, ct_equal, AesKey, Entry};
64
use crate::Error;
5+
use crate::low::ghash::{Ghash, GhashTable};
6+
use crate::low::{AesKey, Entry, aes_gcm, ct_equal};
77

88
/// An AES-GCM key.
99
///

‎graviola/src/mid/chacha20poly1305.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// Written for Graviola by Joe Birr-Pixton, 2024.
22
// SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT-0
33

4+
use crate::Error;
45
use crate::low::chacha20::ChaCha20;
56
use crate::low::poly1305::Poly1305;
6-
use crate::low::{ct_equal, zeroise, Entry};
7-
use crate::Error;
7+
use crate::low::{Entry, ct_equal, zeroise};
88

99
/// A ChaCha20Poly1305 key.
1010
///

0 commit comments

Comments
 (0)