Skip to content

Commit da78856

Browse files
committed
feat: drop the hazmat guarding feature
Now that the signature's hazmat-preview feature has matured, enable corresponding interfaces by default and drop the 'hazmat' feature. Signed-off-by: Dmitry Baryshkov <[email protected]>
1 parent 840583f commit da78856

File tree

3 files changed

+2
-15
lines changed

3 files changed

+2
-15
lines changed

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ name = "key"
5353

5454
[features]
5555
default = ["std", "pem"]
56-
hazmat = []
5756
nightly = ["num-bigint/nightly"]
5857
serde = ["num-bigint/serde", "serde_crate"]
5958
expose-internals = []

src/pkcs1v15.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ use core::marker::PhantomData;
1313
use digest::Digest;
1414
use pkcs8::{AssociatedOid, Document, EncodePrivateKey, EncodePublicKey, SecretDocument};
1515
use rand_core::CryptoRngCore;
16-
#[cfg(feature = "hazmat")]
17-
use signature::hazmat::{PrehashSigner, PrehashVerifier};
1816
use signature::{
17+
hazmat::{PrehashSigner, PrehashVerifier},
1918
DigestSigner, DigestVerifier, Keypair, RandomizedDigestSigner, RandomizedSigner,
2019
SignatureEncoding, Signer, Verifier,
2120
};
@@ -437,7 +436,6 @@ where
437436
}
438437
}
439438

440-
#[cfg(feature = "hazmat")]
441439
impl<D> PrehashSigner<Signature> for SigningKey<D>
442440
where
443441
D: Digest,
@@ -575,7 +573,6 @@ where
575573
}
576574
}
577575

578-
#[cfg(feature = "hazmat")]
579576
impl<D> PrehashVerifier<Signature> for VerifyingKey<D>
580577
where
581578
D: Digest,
@@ -971,7 +968,6 @@ mod tests {
971968
.expect("failed to verify");
972969
}
973970

974-
#[cfg(feature = "hazmat")]
975971
#[test]
976972
fn test_unpadded_signature_hazmat() {
977973
let msg = b"Thu Dec 19 18:06:16 EST 2013\n";

src/pss.rs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@ use core::marker::PhantomData;
1717
use digest::{Digest, DynDigest, FixedOutputReset};
1818
use pkcs8::{Document, EncodePrivateKey, EncodePublicKey, SecretDocument};
1919
use rand_core::CryptoRngCore;
20-
#[cfg(feature = "hazmat")]
21-
use signature::hazmat::{PrehashVerifier, RandomizedPrehashSigner};
2220
use signature::{
21+
hazmat::{PrehashVerifier, RandomizedPrehashSigner},
2322
DigestVerifier, Keypair, RandomizedDigestSigner, RandomizedSigner, SignatureEncoding, Verifier,
2423
};
2524
use subtle::ConstantTimeEq;
@@ -631,7 +630,6 @@ where
631630
}
632631
}
633632

634-
#[cfg(feature = "hazmat")]
635633
impl<D> RandomizedPrehashSigner<Signature> for SigningKey<D>
636634
where
637635
D: Digest + FixedOutputReset,
@@ -763,7 +761,6 @@ where
763761
}
764762
}
765763

766-
#[cfg(feature = "hazmat")]
767764
impl<D> RandomizedPrehashSigner<Signature> for BlindedSigningKey<D>
768765
where
769766
D: Digest + FixedOutputReset,
@@ -865,7 +862,6 @@ where
865862
}
866863
}
867864

868-
#[cfg(feature = "hazmat")]
869865
impl<D> PrehashVerifier<Signature> for VerifyingKey<D>
870866
where
871867
D: Digest + FixedOutputReset,
@@ -903,7 +899,6 @@ mod test {
903899
use num_traits::{FromPrimitive, Num};
904900
use rand_chacha::{rand_core::SeedableRng, ChaCha8Rng};
905901
use sha1::{Digest, Sha1};
906-
#[cfg(feature = "hazmat")]
907902
use signature::hazmat::{PrehashVerifier, RandomizedPrehashSigner};
908903
use signature::{DigestVerifier, Keypair, RandomizedDigestSigner, RandomizedSigner, Verifier};
909904

@@ -1160,7 +1155,6 @@ mod test {
11601155
}
11611156
}
11621157

1163-
#[cfg(feature = "hazmat")]
11641158
#[test]
11651159
fn test_verify_pss_hazmat() {
11661160
let priv_key = get_private_key();
@@ -1198,7 +1192,6 @@ mod test {
11981192
}
11991193
}
12001194

1201-
#[cfg(feature = "hazmat")]
12021195
#[test]
12031196
fn test_sign_and_verify_pss_hazmat() {
12041197
let priv_key = get_private_key();
@@ -1218,7 +1211,6 @@ mod test {
12181211
}
12191212
}
12201213

1221-
#[cfg(feature = "hazmat")]
12221214
#[test]
12231215
fn test_sign_and_verify_pss_blinded_hazmat() {
12241216
let priv_key = get_private_key();

0 commit comments

Comments
 (0)