Skip to content

Migrate from subtle to ctutils #507

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tarcieri merged 1 commit into from
May 10, 2026
Merged

Migrate from subtle to ctutils #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions Cargo.lock
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions ssh-cipher/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ aes = { version = "0.9.0-rc.4", optional = true, default-features = false }
aes-gcm = { version = "0.11.0-rc.3", optional = true, default-features = false, features = ["aes"] }
cbc = { version = "0.2", optional = true }
ctr = { version = "0.10.0-rc.4", optional = true, default-features = false }
ctutils = { version = "0.4", optional = true, default-features = false }
chacha20 = { version = "0.10.0-rc.10", optional = true, default-features = false, features = ["cipher", "legacy"] }
des = { version = "0.9.0-rc.3", optional = true, default-features = false }
poly1305 = { version = "0.9.0-rc.6", optional = true, default-features = false }
subtle = { version = "2", optional = true, default-features = false }
zeroize = { version = "1", optional = true, default-features = false }

[dev-dependencies]
Expand All @@ -41,7 +41,7 @@ hex-literal = "1"
aes-cbc = ["dep:aes", "dep:cbc"]
aes-ctr = ["dep:aes", "dep:ctr"]
aes-gcm = ["dep:aead", "dep:aes", "dep:aes-gcm"]
chacha20poly1305 = ["dep:aead", "dep:chacha20", "dep:poly1305", "dep:subtle"]
chacha20poly1305 = ["dep:aead", "dep:chacha20", "dep:poly1305", "dep:ctutils"]
tdes = ["dep:des", "dep:cbc"]
zeroize = [
"dep:zeroize",
Expand Down
2 changes: 1 addition & 1 deletion ssh-cipher/src/chacha20poly1305.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ use aead::{
inout::InOutBuf,
};
use cipher::{KeyIvInit, StreamCipher, StreamCipherSeek};
use ctutils::CtEq;
use poly1305::{Poly1305, universal_hash::UniversalHash};
use subtle::ConstantTimeEq;

#[cfg(feature = "zeroize")]
use zeroize::{Zeroize, ZeroizeOnDrop};
Expand Down
2 changes: 1 addition & 1 deletion ssh-encoding/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ rust-version = "1.85"
base64ct = { version = "1.8", optional = true }
bigint = { package = "crypto-bigint", version = "0.7", optional = true, default-features = false, features = ["alloc"] }
bytes = { version = "1", optional = true, default-features = false }
ctutils = { version = "0.4", optional = true, default-features = false }
digest = { version = "0.11", optional = true, default-features = false }
pem-rfc7468 = { version = "1", optional = true }
ssh-derive = { version = "0.3.0-rc.0", optional = true }
subtle = { version = "2", optional = true, default-features = false }
zeroize = { version = "1", optional = true, default-features = false }

[dev-dependencies]
Expand Down
16 changes: 8 additions & 8 deletions ssh-encoding/src/mpint.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ use core::fmt;
#[cfg(feature = "bigint")]
use crate::Uint;

#[cfg(feature = "subtle")]
use subtle::{Choice, ConstantTimeEq};
#[cfg(feature = "ctutils")]
use ctutils::{Choice, CtEq};

#[cfg(any(feature = "bigint", feature = "zeroize"))]
use zeroize::Zeroize;
Expand Down Expand Up @@ -40,8 +40,8 @@ use zeroize::Zeroizing;
/// | 80 | `00 00 00 02 00 80`
/// |-1234 | `00 00 00 02 ed cc`
/// | -deadbeef | `00 00 00 05 ff 21 52 41 11`
#[cfg_attr(not(feature = "subtle"), derive(Clone))]
#[cfg_attr(feature = "subtle", derive(Clone, Ord, PartialOrd))] // TODO: constant time (Partial)`Ord`?
#[cfg_attr(not(feature = "ctutils"), derive(Clone))]
#[cfg_attr(feature = "ctutils", derive(Clone, Ord, PartialOrd))] // TODO: constant time (Partial)`Ord`?
pub struct Mpint {
/// Inner big endian-serialized integer value
inner: Box<[u8]>,
Expand Down Expand Up @@ -112,17 +112,17 @@ impl AsRef<[u8]> for Mpint {
}
}

#[cfg(feature = "subtle")]
impl ConstantTimeEq for Mpint {
#[cfg(feature = "ctutils")]
impl CtEq for Mpint {
fn ct_eq(&self, other: &Self) -> Choice {
self.as_ref().ct_eq(other.as_ref())
}
}

#[cfg(feature = "subtle")]
#[cfg(feature = "ctutils")]
impl Eq for Mpint {}

#[cfg(feature = "subtle")]
#[cfg(feature = "ctutils")]
impl PartialEq for Mpint {
fn eq(&self, other: &Self) -> bool {
self.ct_eq(other).into()
Expand Down
4 changes: 2 additions & 2 deletions ssh-key/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ features = ["zeroize"]
[dependencies.encoding]
version = "0.3.0-rc.8"
package = "ssh-encoding"
features = ["base64", "digest", "pem", "subtle", "zeroize"]
features = ["base64", "digest", "pem", "ctutils", "zeroize"]

[dependencies]
ctutils = { version = "0.4", default-features = false }
sha2 = { version = "0.11", default-features = false }
signature = { version = "3", default-features = false }
subtle = { version = "2", default-features = false }
zeroize = { version = "1", default-features = false }

# optional dependencies
Expand Down
2 changes: 1 addition & 1 deletion ssh-key/src/ppk.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ use sha2::Sha256;
use crate::private::KeypairData;
use crate::public::KeyData;
use crate::{Algorithm, Error, PublicKey};
use ctutils::CtEq;
use encoding::base64::{self, Base64, Encoding};
use encoding::{Decode, Encode, LabelError, Reader};
use subtle::ConstantTimeEq;

#[derive(Debug)]
pub enum Kdf {
Expand Down
4 changes: 2 additions & 2 deletions ssh-key/src/private.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,11 @@ pub use self::sk::SkEcdsaSha2NistP256;
use crate::{Algorithm, Cipher, Error, Fingerprint, HashAlg, Kdf, PublicKey, Result, public};
use cipher::Tag;
use core::str;
use ctutils::{Choice, CtEq};
use encoding::{
CheckedSum, Decode, DecodePem, Encode, EncodePem, Reader, Writer,
pem::{LineEnding, PemLabel},
};
use subtle::{Choice, ConstantTimeEq};

#[cfg(feature = "alloc")]
use {
Expand Down Expand Up @@ -737,7 +737,7 @@ impl PrivateKey {
}
}

impl ConstantTimeEq for PrivateKey {
impl CtEq for PrivateKey {
fn ct_eq(&self, other: &Self) -> Choice {
// Constant-time with respect to private key data
self.key_data.ct_eq(&other.key_data)
Expand Down
6 changes: 3 additions & 3 deletions ssh-key/src/private/dsa.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

use crate::{Error, Mpint, Result, public::DsaPublicKey};
use core::fmt;
use ctutils::{Choice, CtEq};
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
use subtle::{Choice, ConstantTimeEq};
use zeroize::Zeroize;

#[cfg(feature = "dsa")]
Expand Down Expand Up @@ -51,7 +51,7 @@ impl AsRef<[u8]> for DsaPrivateKey {
}
}

impl ConstantTimeEq for DsaPrivateKey {
impl CtEq for DsaPrivateKey {
fn ct_eq(&self, other: &Self) -> Choice {
self.inner.ct_eq(&other.inner)
}
Expand Down Expand Up @@ -181,7 +181,7 @@ impl DsaKeypair {
}
}

impl ConstantTimeEq for DsaKeypair {
impl CtEq for DsaKeypair {
fn ct_eq(&self, other: &Self) -> Choice {
Choice::from((self.public == other.public) as u8) & self.private.ct_eq(&other.private)
}
Expand Down
6 changes: 3 additions & 3 deletions ssh-key/src/private/ecdsa.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

use crate::{Algorithm, EcdsaCurve, Error, Result, public::EcdsaPublicKey};
use core::fmt;
use ctutils::{Choice, CtEq};
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
use sec1::consts::{U32, U48, U66};
use subtle::{Choice, ConstantTimeEq};
use zeroize::Zeroize;

#[cfg(feature = "rand_core")]
Expand Down Expand Up @@ -106,7 +106,7 @@ impl<const SIZE: usize> AsRef<[u8; SIZE]> for EcdsaPrivateKey<SIZE> {
}
}

impl<const SIZE: usize> ConstantTimeEq for EcdsaPrivateKey<SIZE> {
impl<const SIZE: usize> CtEq for EcdsaPrivateKey<SIZE> {
fn ct_eq(&self, other: &Self) -> Choice {
self.as_ref().ct_eq(other.as_ref())
}
Expand Down Expand Up @@ -282,7 +282,7 @@ impl EcdsaKeypair {
}
}

impl ConstantTimeEq for EcdsaKeypair {
impl CtEq for EcdsaKeypair {
fn ct_eq(&self, other: &Self) -> Choice {
let public_eq =
Choice::from((EcdsaPublicKey::from(self) == EcdsaPublicKey::from(other)) as u8);
Expand Down
6 changes: 3 additions & 3 deletions ssh-key/src/private/ed25519.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

use crate::{Error, Result, public::Ed25519PublicKey};
use core::fmt;
use ctutils::{Choice, CtEq};
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
use subtle::{Choice, ConstantTimeEq};
use zeroize::{Zeroize, Zeroizing};

#[cfg(feature = "rand_core")]
Expand Down Expand Up @@ -45,7 +45,7 @@ impl AsRef<[u8; Self::BYTE_SIZE]> for Ed25519PrivateKey {
}
}

impl ConstantTimeEq for Ed25519PrivateKey {
impl CtEq for Ed25519PrivateKey {
fn ct_eq(&self, other: &Self) -> Choice {
self.as_ref().ct_eq(other.as_ref())
}
Expand Down Expand Up @@ -192,7 +192,7 @@ impl Ed25519Keypair {
}
}

impl ConstantTimeEq for Ed25519Keypair {
impl CtEq for Ed25519Keypair {
fn ct_eq(&self, other: &Self) -> Choice {
Choice::from((self.public == other.public) as u8) & self.private.ct_eq(&other.private)
}
Expand Down
4 changes: 2 additions & 2 deletions ssh-key/src/private/keypair.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

use super::ed25519::Ed25519Keypair;
use crate::{Algorithm, Error, Result, public};
use ctutils::{Choice, CtEq};
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
use subtle::{Choice, ConstantTimeEq};

#[cfg(feature = "alloc")]
use {
Expand Down Expand Up @@ -269,7 +269,7 @@ impl KeypairData {
}
}

impl ConstantTimeEq for KeypairData {
impl CtEq for KeypairData {
fn ct_eq(&self, other: &Self) -> Choice {
// Note: constant-time with respect to key *data* comparisons, not algorithms
match (self, other) {
Expand Down
6 changes: 3 additions & 3 deletions ssh-key/src/private/opaque.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ use crate::{
};
use alloc::vec::Vec;
use core::fmt;
use ctutils::{Choice, CtEq};
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
use subtle::{Choice, ConstantTimeEq};

/// An opaque private key.
///
Expand Down Expand Up @@ -118,7 +118,7 @@ impl Encode for OpaqueKeypair {
}
}

impl ConstantTimeEq for OpaqueKeypair {
impl CtEq for OpaqueKeypair {
fn ct_eq(&self, other: &Self) -> Choice {
Choice::from((self.public == other.public) as u8) & self.private.ct_eq(&other.private)
}
Expand Down Expand Up @@ -148,7 +148,7 @@ impl fmt::Debug for OpaqueKeypair {
}
}

impl ConstantTimeEq for OpaquePrivateKeyBytes {
impl CtEq for OpaquePrivateKeyBytes {
fn ct_eq(&self, other: &Self) -> Choice {
self.as_ref().ct_eq(other.as_ref())
}
Expand Down
6 changes: 3 additions & 3 deletions ssh-key/src/private/rsa.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

use crate::{Error, Mpint, Result, public::RsaPublicKey};
use core::fmt;
use ctutils::{Choice, CtEq};
use encoding::{CheckedSum, Decode, Encode, Reader, Writer};
use subtle::{Choice, ConstantTimeEq};
use zeroize::Zeroize;

#[cfg(feature = "rsa")]
Expand Down Expand Up @@ -66,7 +66,7 @@ impl RsaPrivateKey {
}
}

impl ConstantTimeEq for RsaPrivateKey {
impl CtEq for RsaPrivateKey {
fn ct_eq(&self, other: &Self) -> Choice {
self.d.ct_eq(&other.d)
& self.iqmp.ct_eq(&self.iqmp)
Expand Down Expand Up @@ -163,7 +163,7 @@ impl RsaKeypair {
}
}

impl ConstantTimeEq for RsaKeypair {
impl CtEq for RsaKeypair {
fn ct_eq(&self, other: &Self) -> Choice {
Choice::from((self.public == other.public) as u8) & self.private.ct_eq(&other.private)
}
Expand Down
Loading