Skip to content

Commit

Permalink
Rust 1.80 fixes
Browse files Browse the repository at this point in the history
- `size_of` and `size_of_val` have been moved to the prelude, so import
  them directly as `core::mem::{size_of, size_of_val}` rather than
  importing `core::mem`.
- Removes dead code gated on removed features
- pkcs5: add missing `std` feature
- tls_codec: allow `cfg(fuzzing)`
  • Loading branch information
tarcieri committed Jul 25, 2024
1 parent a1bb81b commit 76acb2d
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 9 deletions.
4 changes: 2 additions & 2 deletions const-oid/src/arcs.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//! Arcs are integer values which exist within an OID's hierarchy.
use crate::{Error, Result};
use core::mem;
use core::mem::size_of;

#[cfg(doc)]
use crate::ObjectIdentifier;
Expand All @@ -25,7 +25,7 @@ pub(crate) const ARC_MAX_FIRST: Arc = 2;
pub(crate) const ARC_MAX_SECOND: Arc = 39;

/// Maximum number of bytes supported in an arc.
const ARC_MAX_BYTES: usize = mem::size_of::<Arc>();
const ARC_MAX_BYTES: usize = size_of::<Arc>();

/// Maximum value of the last byte in an arc.
const ARC_MAX_LAST_OCTET: u8 = 0b11110000; // Max bytes of leading 1-bits
Expand Down
5 changes: 4 additions & 1 deletion der/src/asn1/bit_string.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ use crate::{
};
use core::{cmp::Ordering, iter::FusedIterator};

#[cfg(feature = "flagset")]
use core::mem::size_of_val;

/// ASN.1 `BIT STRING` type.
///
/// This type contains a sequence of any number of bits, modeled internally as
Expand Down Expand Up @@ -454,7 +457,7 @@ where

let mut flags = T::none().bits();

if bits.bit_len() > core::mem::size_of_val(&flags) * 8 {
if bits.bit_len() > size_of_val(&flags) * 8 {
return Err(Error::new(ErrorKind::Overlength, position));
}

Expand Down
4 changes: 2 additions & 2 deletions der/src/asn1/integer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
pub(super) mod int;
pub(super) mod uint;

use core::{cmp::Ordering, mem};
use core::{cmp::Ordering, mem::size_of};

use crate::{EncodeValue, Result, SliceWriter};

Expand All @@ -22,7 +22,7 @@ where
T: Copy + EncodeValue + Sized,
{
const MAX_INT_SIZE: usize = 16;
debug_assert!(mem::size_of::<T>() <= MAX_INT_SIZE);
debug_assert!(size_of::<T>() <= MAX_INT_SIZE);

let mut buf1 = [0u8; MAX_INT_SIZE];
let mut encoder1 = SliceWriter::new(&mut buf1);
Expand Down
3 changes: 0 additions & 3 deletions der/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -375,9 +375,6 @@ pub use crate::{
#[cfg(feature = "alloc")]
pub use crate::{asn1::Any, document::Document};

#[cfg(feature = "bigint")]
pub use crypto_bigint as bigint;

#[cfg(feature = "derive")]
pub use der_derive::{Choice, Enumerated, Sequence, ValueOrd};

Expand Down
2 changes: 2 additions & 0 deletions pkcs5/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ hex-literal = "0.4"

[features]
alloc = []
std = []

3des = ["dep:des", "pbes2"]
des-insecure = ["dep:des", "pbes2"]
getrandom = ["rand_core/getrandom"]
Expand Down
3 changes: 3 additions & 0 deletions pkcs5/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
#[cfg(all(feature = "alloc", feature = "pbes2"))]
extern crate alloc;

#[cfg(feature = "std")]
extern crate std;

mod error;

pub mod pbes1;
Expand Down
5 changes: 4 additions & 1 deletion pkcs5/src/pbes2/kdf.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ use der::{
Writer,
};

#[cfg(feature = "pbes2")]
use core::mem::size_of;

/// Password-Based Key Derivation Function (PBKDF2) OID.
pub const PBKDF2_OID: ObjectIdentifier = ObjectIdentifier::new_unwrap("1.2.840.113549.1.5.12");

Expand Down Expand Up @@ -483,7 +486,7 @@ impl TryFrom<&ScryptParams> for scrypt::Params {
let n = params.cost_parameter;

// Compute log2 and verify its correctness
let log_n = ((8 * core::mem::size_of::<ScryptCost>() as u32) - n.leading_zeros() - 1) as u8;
let log_n = ((8 * size_of::<ScryptCost>() as u32) - n.leading_zeros() - 1) as u8;

if 1 << log_n != n {
return Err(ScryptParams::INVALID_ERR);
Expand Down
4 changes: 4 additions & 0 deletions tls_codec/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,7 @@ harness = false
[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docsrs"]

[lints.rust.unexpected_cfgs]
level = "warn"
check-cfg = ['cfg(fuzzing)']

0 comments on commit 76acb2d

Please sign in to comment.