diff --git a/Cargo.lock b/Cargo.lock
index e16937de..527d50d3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -57,9 +57,6 @@ name = "ecdsa"
 version = "0.6.1"
 dependencies = [
  "elliptic-curve",
- "k256",
- "p256",
- "p384",
  "sha2",
  "signature",
 ]
@@ -76,11 +73,10 @@ dependencies = [
 [[package]]
 name = "elliptic-curve"
 version = "0.4.0"
-source = "git+https://github.com/RustCrypto/elliptic-curves#fd3516fde64d5d9ef160f1c4392d807ca7ede6ea"
+source = "git+https://github.com/RustCrypto/traits#cbe0f2ae5902ef5f0750b48ce526febc05dcb20d"
 dependencies = [
  "generic-array",
  "subtle",
- "zeroize",
 ]
 
 [[package]]
@@ -98,36 +94,12 @@ dependencies = [
  "typenum",
 ]
 
-[[package]]
-name = "k256"
-version = "0.3.0"
-source = "git+https://github.com/RustCrypto/elliptic-curves#fd3516fde64d5d9ef160f1c4392d807ca7ede6ea"
-dependencies = [
- "elliptic-curve",
-]
-
 [[package]]
 name = "opaque-debug"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c"
 
-[[package]]
-name = "p256"
-version = "0.3.0"
-source = "git+https://github.com/RustCrypto/elliptic-curves#fd3516fde64d5d9ef160f1c4392d807ca7ede6ea"
-dependencies = [
- "elliptic-curve",
-]
-
-[[package]]
-name = "p384"
-version = "0.2.0"
-source = "git+https://github.com/RustCrypto/elliptic-curves#fd3516fde64d5d9ef160f1c4392d807ca7ede6ea"
-dependencies = [
- "elliptic-curve",
-]
-
 [[package]]
 name = "serde"
 version = "1.0.104"
@@ -166,9 +138,3 @@ name = "typenum"
 version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d2783fe2d6b8c1101136184eb41be8b1ad379e4657050b8aaff0c79ee7575f9"
-
-[[package]]
-name = "zeroize"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cbac2ed2ba24cc90f5e06485ac8c7c1e5449fe8911aef4d8877218af021a5b8"
diff --git a/Cargo.toml b/Cargo.toml
index 9e18994f..8bcb2dda 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,4 @@
 members = ["ecdsa", "ed25519"]
 
 [patch.crates-io]
-elliptic-curve = { git = "https://github.com/RustCrypto/elliptic-curves" }
-k256 = { git = "https://github.com/RustCrypto/elliptic-curves" }
-p256 = { git = "https://github.com/RustCrypto/elliptic-curves" }
-p384 = { git = "https://github.com/RustCrypto/elliptic-curves" }
+elliptic-curve = { git = "https://github.com/RustCrypto/traits" }
diff --git a/ecdsa/Cargo.toml b/ecdsa/Cargo.toml
index 27440999..c89d3db7 100644
--- a/ecdsa/Cargo.toml
+++ b/ecdsa/Cargo.toml
@@ -19,21 +19,6 @@ version = "0.4"
 default-features = false
 features = ["weierstrass"]
 
-[dependencies.k256]
-version = "0.3"
-optional = true
-default-features = false
-
-[dependencies.p256]
-version = "0.3"
-optional = true
-default-features = false
-
-[dependencies.p384]
-version = "0.2"
-optional = true
-default-features = false
-
 [dependencies.sha2]
 version = "0.9"
 optional = true
@@ -44,14 +29,10 @@ version = ">= 1.1.0, < 1.2.0"
 default-features = false
 
 [features]
-default = ["digest", "std", "zeroize"]
+default = ["digest", "std"]
 digest = ["signature/digest-preview", "sha2"]
-secp256k1 = ["k256"]
-secp256k1-arithmetic = ["k256/arithmetic", "secp256k1"]
+hazmat = []
 std = ["elliptic-curve/std", "signature/std"]
-zeroize = ["elliptic-curve/zeroize"]
-test-vectors = []
 
 [package.metadata.docs.rs]
-all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
diff --git a/ecdsa/src/asn1_signature.rs b/ecdsa/src/asn1_signature.rs
index 8a37af68..8711308a 100644
--- a/ecdsa/src/asn1_signature.rs
+++ b/ecdsa/src/asn1_signature.rs
@@ -2,7 +2,6 @@
 
 use crate::{
     convert::ScalarPair,
-    curve::Curve,
     generic_array::{typenum::Unsigned, ArrayLength, GenericArray},
     Error,
 };
@@ -11,6 +10,7 @@ use core::{
     fmt::{self, Debug},
     ops::Add,
 };
+use elliptic_curve::weierstrass::Curve;
 
 /// Maximum overhead of an ASN.1 DER-encoded ECDSA signature for a given curve:
 /// 9-bytes.
diff --git a/ecdsa/src/convert.rs b/ecdsa/src/convert.rs
index 49c71f2d..6eeb64f4 100644
--- a/ecdsa/src/convert.rs
+++ b/ecdsa/src/convert.rs
@@ -301,22 +301,35 @@ where
 
 #[cfg(all(test, feature = "test-vectors"))]
 mod tests {
-    use crate::{
-        curve::nistp256::{Asn1Signature, FixedSignature},
-        test_vectors::nistp256::SHA256_FIXED_SIZE_TEST_VECTORS,
-    };
+    use elliptic_curve::{consts::U32, weierstrass::Curve};
     use signature::Signature;
 
+    #[derive(Clone, Debug, Default, Eq, PartialEq, PartialOrd, Ord)]
+    pub struct ExampleCurve;
+
+    impl Curve for ExampleCurve {
+        type ScalarSize = U32;
+    }
+
+    type Asn1Signature = crate::Asn1Signature<ExampleCurve>;
+    type FixedSignature = crate::FixedSignature<ExampleCurve>;
+
+    const EXAMPLE_SIGNATURE: [u8; 64] = [
+        0xf3, 0xac, 0x80, 0x61, 0xb5, 0x14, 0x79, 0x5b, 0x88, 0x43, 0xe3, 0xd6, 0x62, 0x95, 0x27,
+        0xed, 0x2a, 0xfd, 0x6b, 0x1f, 0x6a, 0x55, 0x5a, 0x7a, 0xca, 0xbb, 0x5e, 0x6f, 0x79, 0xc8,
+        0xc2, 0xac, 0x8b, 0xf7, 0x78, 0x19, 0xca, 0x5, 0xa6, 0xb2, 0x78, 0x6c, 0x76, 0x26, 0x2b,
+        0xf7, 0x37, 0x1c, 0xef, 0x97, 0xb2, 0x18, 0xe9, 0x6f, 0x17, 0x5a, 0x3c, 0xcd, 0xda, 0x2a,
+        0xcc, 0x5, 0x89, 0x3,
+    ];
+
     #[test]
     fn test_fixed_to_asn1_signature_roundtrip() {
-        for vector in SHA256_FIXED_SIZE_TEST_VECTORS {
-            let fixed_signature = FixedSignature::from_bytes(&vector.sig).unwrap();
+        let fixed_signature = FixedSignature::from_bytes(&EXAMPLE_SIGNATURE).unwrap();
 
-            // Convert to DER and back
-            let asn1_signature = Asn1Signature::from(&fixed_signature);
-            let fixed_signature2 = FixedSignature::from(&asn1_signature);
+        // Convert to DER and back
+        let asn1_signature = Asn1Signature::from(&fixed_signature);
+        let fixed_signature2 = FixedSignature::from(&asn1_signature);
 
-            assert_eq!(fixed_signature, fixed_signature2);
-        }
+        assert_eq!(fixed_signature, fixed_signature2);
     }
 }
diff --git a/ecdsa/src/curve.rs b/ecdsa/src/curve.rs
deleted file mode 100644
index 3894d831..00000000
--- a/ecdsa/src/curve.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-//! Elliptic curves (short Weierstrass form) used by ECDSA
-
-pub use elliptic_curve::weierstrass::{point::*, Curve};
-
-// NIST P-256
-
-#[cfg(feature = "p256")]
-#[cfg_attr(docsrs, doc(cfg(feature = "p256")))]
-pub mod nistp256;
-
-#[cfg(feature = "p256")]
-#[cfg_attr(docsrs, doc(cfg(feature = "p256")))]
-pub use self::nistp256::NistP256;
-
-// NIST P-384
-
-#[cfg(feature = "p384")]
-#[cfg_attr(docsrs, doc(cfg(feature = "p384")))]
-pub mod nistp384;
-
-#[cfg(feature = "p384")]
-#[cfg_attr(docsrs, doc(cfg(feature = "p384")))]
-pub use self::nistp384::NistP384;
-
-// secp256k1 (K-256)
-
-#[cfg(feature = "secp256k1")]
-#[cfg_attr(docsrs, doc(cfg(feature = "secp256k1")))]
-pub mod secp256k1;
-
-#[cfg(feature = "k256")]
-#[cfg_attr(docsrs, doc(cfg(feature = "secp256k1")))]
-pub use self::secp256k1::Secp256k1;
diff --git a/ecdsa/src/curve/nistp256.rs b/ecdsa/src/curve/nistp256.rs
deleted file mode 100644
index 61b28bd1..00000000
--- a/ecdsa/src/curve/nistp256.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-//! NIST P-256 elliptic curve (a.k.a. prime256v1, secp256r1)
-
-pub use p256::{NistP256, PublicKey, SecretKey};
-
-/// ASN.1 DER encoded NIST P-256 ECDSA signature
-pub type Asn1Signature = crate::Asn1Signature<NistP256>;
-
-/// Fixed-sized (a.k.a. "raw") NIST P-256 ECDSA signature
-pub type FixedSignature = crate::FixedSignature<NistP256>;
-
-#[cfg(feature = "digest")]
-impl signature::PrehashSignature for Asn1Signature {
-    type Digest = sha2::Sha256;
-}
-
-#[cfg(feature = "digest")]
-impl signature::PrehashSignature for FixedSignature {
-    type Digest = sha2::Sha256;
-}
diff --git a/ecdsa/src/curve/nistp384.rs b/ecdsa/src/curve/nistp384.rs
deleted file mode 100644
index 35bfc6bd..00000000
--- a/ecdsa/src/curve/nistp384.rs
+++ /dev/null
@@ -1,19 +0,0 @@
-//! NIST P-384 elliptic curve (a.k.a. secp384r1)
-
-pub use p384::{NistP384, PublicKey, SecretKey};
-
-/// ASN.1 DER encoded NIST P-384 ECDSA signature
-pub type Asn1Signature = crate::Asn1Signature<NistP384>;
-
-/// Fixed-sized (a.k.a. "raw") NIST P-384 ECDSA signature
-pub type FixedSignature = crate::FixedSignature<NistP384>;
-
-#[cfg(feature = "digest")]
-impl signature::PrehashSignature for Asn1Signature {
-    type Digest = sha2::Sha384;
-}
-
-#[cfg(feature = "digest")]
-impl signature::PrehashSignature for FixedSignature {
-    type Digest = sha2::Sha384;
-}
diff --git a/ecdsa/src/curve/secp256k1.rs b/ecdsa/src/curve/secp256k1.rs
deleted file mode 100644
index 4f4b5751..00000000
--- a/ecdsa/src/curve/secp256k1.rs
+++ /dev/null
@@ -1,54 +0,0 @@
-//! secp256k1 elliptic curve
-
-#[cfg(feature = "secp256k1-arithmetic")]
-mod normalize_s;
-pub mod recoverable_signature;
-
-pub use k256::{PublicKey, Secp256k1, SecretKey};
-pub use recoverable_signature::{RecoverableSignature, RecoveryId};
-
-#[cfg(feature = "secp256k1-arithmetic")]
-use normalize_s::ScalarPair;
-
-/// ASN.1 DER encoded secp256k1 ECDSA signature.
-pub type Asn1Signature = crate::Asn1Signature<Secp256k1>;
-
-/// Fixed-sized (a.k.a. "raw") secp256k1 ECDSA signature.
-pub type FixedSignature = crate::FixedSignature<Secp256k1>;
-
-#[cfg(feature = "digest")]
-impl signature::PrehashSignature for Asn1Signature {
-    type Digest = sha2::Sha256;
-}
-
-#[cfg(feature = "digest")]
-impl signature::PrehashSignature for FixedSignature {
-    type Digest = sha2::Sha256;
-}
-
-#[cfg(feature = "secp256k1-arithmetic")]
-#[cfg_attr(docsrs, doc(cfg(feature = "secp256k1-arithmetic")))]
-impl Asn1Signature {
-    /// Normalize signature into "low S" form as described in
-    /// [BIP 0062: Dealing with Malleability][1].
-    ///
-    /// [1]: https://github.com/bitcoin/bips/blob/master/bip-0062.mediawiki
-    pub fn normalize_s(&self) -> Result<Self, signature::Error> {
-        // The `Asn1Signature` type should always contain a valid ASN.1 signature
-        let r_and_s = ScalarPair::from_asn1_signature(&self).expect("invalid ASN.1 signature");
-        normalize_s::normalize_s(r_and_s).map(|sig| Self::from(&sig))
-    }
-}
-
-#[cfg(feature = "secp256k1-arithmetic")]
-#[cfg_attr(docsrs, doc(cfg(feature = "secp256k1-arithmetic")))]
-impl FixedSignature {
-    /// Normalize signature into "low S" form as described in
-    /// [BIP 0062: Dealing with Malleability][1].
-    ///
-    /// [1]: https://github.com/bitcoin/bips/blob/master/bip-0062.mediawiki
-    pub fn normalize_s(&self) -> Result<Self, signature::Error> {
-        let r_and_s = ScalarPair::from_fixed_signature(&self);
-        normalize_s::normalize_s(r_and_s)
-    }
-}
diff --git a/ecdsa/src/curve/secp256k1/normalize_s.rs b/ecdsa/src/curve/secp256k1/normalize_s.rs
deleted file mode 100644
index c4b69295..00000000
--- a/ecdsa/src/curve/secp256k1/normalize_s.rs
+++ /dev/null
@@ -1,94 +0,0 @@
-//! Support for normalizing the s-component of ECDSA signatures to the lower
-//! half of the modulus as described in the [Low S values in signatures][1]
-//! section of [BIP 0062: Dealing with Malleability][2].
-//!
-//! [1]: https://github.com/bitcoin/bips/blob/master/bip-0062.mediawiki#Low_S_values_in_signatures
-//! [2]: https://github.com/bitcoin/bips/blob/master/bip-0062.mediawiki
-
-use super::{FixedSignature, Secp256k1};
-use crate::generic_array::GenericArray;
-use k256::{elliptic_curve::subtle::ConditionallySelectable, Scalar};
-use signature::Error;
-
-/// `(r,s)` pair of scalars which comprise a secp256k1 ECDSA signature
-pub(super) type ScalarPair<'a> = crate::convert::ScalarPair<'a, Secp256k1>;
-
-/// Size of a secp256k1 scalar
-const SCALAR_SIZE: usize = 32;
-
-/// Normalize the `s` component of the given [`ScalarPair`] to the lower half
-/// of the modulus.
-pub(super) fn normalize_s(r_and_s: ScalarPair<'_>) -> Result<FixedSignature, Error> {
-    let mut s_bytes = [0u8; SCALAR_SIZE];
-    r_and_s.write_s(&mut s_bytes);
-
-    let s_option = Scalar::from_bytes(s_bytes);
-
-    // Not constant time, but we're operating on public values
-    let s = if s_option.is_some().into() {
-        s_option.unwrap()
-    } else {
-        return Err(Error::new());
-    };
-
-    // Negate `s` if it's within the upper half of the modulus
-    let s_neg = -s;
-    let low_s = Scalar::conditional_select(&s, &s_neg, s.is_high());
-
-    let mut bytes = GenericArray::default();
-    r_and_s.write_r(&mut bytes[..SCALAR_SIZE]);
-    bytes[SCALAR_SIZE..].copy_from_slice(&low_s.to_bytes());
-
-    Ok(FixedSignature::from(bytes))
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use signature::Signature;
-
-    #[test]
-    fn already_normalized() {
-        #[rustfmt::skip]
-        let sig = FixedSignature::from_bytes(&[
-            1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-        ]).unwrap();
-
-        let sig_normalized = sig.normalize_s().unwrap();
-        assert_eq!(sig, sig_normalized);
-    }
-
-    // Test vectors generated using rust-secp256k1
-    #[test]
-    fn not_normalized() {
-        #[rustfmt::skip]
-        let sig_hi = FixedSignature::from_bytes(&[
-            0x20, 0xc0, 0x1a, 0x91, 0x0e, 0xbb, 0x26, 0x10,
-            0xaf, 0x2d, 0x76, 0x3f, 0xa0, 0x9b, 0x3b, 0x30,
-            0x92, 0x3c, 0x8e, 0x40, 0x8b, 0x11, 0xdf, 0x2c,
-            0x61, 0xad, 0x76, 0xd9, 0x70, 0xa2, 0xf1, 0xbc,
-            0xee, 0x2f, 0x11, 0xef, 0x8c, 0xb0, 0x0a, 0x49,
-            0x61, 0x7d, 0x13, 0x57, 0xf4, 0xd5, 0x56, 0x41,
-            0x09, 0x0a, 0x48, 0xf2, 0x01, 0xe9, 0xb9, 0x59,
-            0xc4, 0x8f, 0x6f, 0x6b, 0xec, 0x6f, 0x93, 0x8f,
-        ]).unwrap();
-
-        #[rustfmt::skip]
-        let sig_lo = FixedSignature::from_bytes(&[
-            0x20, 0xc0, 0x1a, 0x91, 0x0e, 0xbb, 0x26, 0x10,
-            0xaf, 0x2d, 0x76, 0x3f, 0xa0, 0x9b, 0x3b, 0x30,
-            0x92, 0x3c, 0x8e, 0x40, 0x8b, 0x11, 0xdf, 0x2c,
-            0x61, 0xad, 0x76, 0xd9, 0x70, 0xa2, 0xf1, 0xbc,
-            0x11, 0xd0, 0xee, 0x10, 0x73, 0x4f, 0xf5, 0xb6,
-            0x9e, 0x82, 0xec, 0xa8, 0x0b, 0x2a, 0xa9, 0xbd,
-            0xb1, 0xa4, 0x93, 0xf4, 0xad, 0x5e, 0xe6, 0xe1,
-            0xfb, 0x42, 0xef, 0x20, 0xe3, 0xc6, 0xad, 0xb2,
-        ]).unwrap();
-
-        let sig_normalized = sig_hi.normalize_s().unwrap();
-        assert_eq!(sig_lo, sig_normalized);
-    }
-}
diff --git a/ecdsa/src/curve/secp256k1/recoverable_signature.rs b/ecdsa/src/curve/secp256k1/recoverable_signature.rs
deleted file mode 100644
index 55abd6f9..00000000
--- a/ecdsa/src/curve/secp256k1/recoverable_signature.rs
+++ /dev/null
@@ -1,108 +0,0 @@
-//! Ethereum-style "recoverable signatures"
-
-use super::FixedSignature;
-use crate::{
-    generic_array::{typenum::U64, GenericArray},
-    Error,
-};
-use core::{
-    convert::{TryFrom, TryInto},
-    fmt::{self, Debug},
-};
-
-#[cfg(docsrs)]
-use super::PublicKey;
-
-/// Size of an Ethereum-style recoverable signature in bytes
-pub const SIZE: usize = 65;
-
-/// Ethereum-style "recoverable signatures" which allow for the recovery of
-/// the signer's [`PublicKey`] from the signature itself.
-///
-/// This format consists of [`FixedSignature`] followed by a 1-byte
-/// [`RecoveryId`] (65-bytes total):
-///
-/// - `r`: 32-byte integer, big endian
-/// - `s`: 32-byte integer, big endian
-/// - `v`: 1-byte [`RecoveryId`]
-#[derive(Copy, Clone)]
-pub struct RecoverableSignature {
-    bytes: [u8; SIZE],
-}
-
-impl RecoverableSignature {
-    /// Get the [`RecoveryId`] for this signature
-    pub fn recovery_id(self) -> RecoveryId {
-        self.bytes[0].try_into().expect("invalid recovery ID")
-    }
-}
-
-impl signature::Signature for RecoverableSignature {
-    fn from_bytes(bytes: &[u8]) -> Result<Self, Error> {
-        bytes.try_into()
-    }
-}
-
-impl AsRef<[u8]> for RecoverableSignature {
-    fn as_ref(&self) -> &[u8] {
-        &self.bytes[..]
-    }
-}
-
-impl Debug for RecoverableSignature {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "RecoverableSignature {{ bytes: {:?}) }}", self.as_ref())
-    }
-}
-
-// TODO(tarcieri): derive `Eq` after const generics are available
-impl Eq for RecoverableSignature {}
-
-// TODO(tarcieri): derive `PartialEq` after const generics are available
-impl PartialEq for RecoverableSignature {
-    fn eq(&self, other: &Self) -> bool {
-        self.as_ref().eq(other.as_ref())
-    }
-}
-
-impl TryFrom<&[u8]> for RecoverableSignature {
-    type Error = Error;
-
-    fn try_from(bytes: &[u8]) -> Result<Self, Error> {
-        if bytes.len() == SIZE && RecoveryId::try_from(bytes[64]).is_ok() {
-            let mut arr = [0u8; SIZE];
-            arr.copy_from_slice(bytes);
-            Ok(Self { bytes: arr })
-        } else {
-            Err(Error::new())
-        }
-    }
-}
-
-impl From<RecoverableSignature> for FixedSignature {
-    fn from(sig: RecoverableSignature) -> FixedSignature {
-        GenericArray::<u8, U64>::clone_from_slice(&sig.bytes[..64]).into()
-    }
-}
-
-/// Identifier used to compute a `PublicKey` from a [`RecoverableSignature`]
-#[derive(Copy, Clone, Debug)]
-pub struct RecoveryId(u8);
-
-impl TryFrom<u8> for RecoveryId {
-    type Error = Error;
-
-    fn try_from(byte: u8) -> Result<Self, Error> {
-        if byte < 4 {
-            Ok(Self(byte))
-        } else {
-            Err(Error::new())
-        }
-    }
-}
-
-impl From<RecoveryId> for u8 {
-    fn from(recovery_id: RecoveryId) -> u8 {
-        recovery_id.0
-    }
-}
diff --git a/ecdsa/src/fixed_signature.rs b/ecdsa/src/fixed_signature.rs
index 32ee1f6f..f62cf120 100644
--- a/ecdsa/src/fixed_signature.rs
+++ b/ecdsa/src/fixed_signature.rs
@@ -1,7 +1,6 @@
 //! Fixed-sized (a.k.a. "raw") ECDSA signatures
 
 use crate::{
-    curve::Curve,
     generic_array::{typenum::Unsigned, ArrayLength, GenericArray},
     Error,
 };
@@ -10,6 +9,7 @@ use core::{
     fmt::{self, Debug},
     ops::Add,
 };
+use elliptic_curve::weierstrass::Curve;
 
 /// Size of a fixed sized signature for the given elliptic curve.
 pub type Size<ScalarSize> = <ScalarSize as Add>::Output;
diff --git a/ecdsa/src/hazmat.rs b/ecdsa/src/hazmat.rs
new file mode 100644
index 00000000..a46cb0b9
--- /dev/null
+++ b/ecdsa/src/hazmat.rs
@@ -0,0 +1,68 @@
+//! Low-level ECDSA primitives
+//!
+//! # ⚠️ Warning: Hazmat!
+//!
+//! YOU PROBABLY DON'T WANT TO USE THESE!
+//!
+//! These primitives are easy-to-misuse low-level interfaces intended to be
+//! implemented by elliptic curve crates and consumed only by this crate!
+//!
+//! If you are an end user / non-expert in cryptography, do not use these!
+//! Failure to use them correctly can lead to catastrophic failures including
+//! FULL PRIVATE KEY RECOVERY!
+
+use crate::fixed_signature::{FixedSignature, Size as FixedSignatureSize};
+use elliptic_curve::{generic_array::ArrayLength, weierstrass::Curve, Error, ScalarBytes};
+
+/// Try to sign the given prehashed message using ECDSA.
+///
+/// This trait is intended to be implemented on a type with access
+/// to the secret scalar via `&self`, such as particular curve's `Scalar` type,
+/// or potentially a key handle to a hardware device.
+pub trait SignPrimitive<C>
+where
+    C: Curve,
+    FixedSignatureSize<C::ScalarSize>: ArrayLength<u8>,
+{
+    /// Scalar type
+    // TODO(tarcieri): add bounds that support generation/conversion from bytes
+    type Scalar;
+
+    /// Try to sign the prehashed message.
+    ///
+    /// Accepts the following arguments:
+    ///
+    /// - `ephemeral_scalar`: ECDSA `k` value (MUST BE UNIFORMLY RANDOM!!!)
+    /// - `masking_scalar`: optional blinding factor for sidechannel resistance
+    /// - `hashed_msg`: prehashed message to be signed
+    fn try_sign_prehashed(
+        &self,
+        ephemeral_scalar: Self::Scalar,
+        masking_scalar: Option<Self::Scalar>,
+        hashed_msg: &ScalarBytes<C::ScalarSize>,
+    ) -> Result<FixedSignature<C>, Error>;
+}
+
+/// Verify the given prehashed message using ECDSA.
+///
+/// This trait is intended to be implemented on type which can access
+/// the affine point represeting the public key via `&self`, such as a
+/// particular curve's `AffinePoint` type.
+pub trait VerifyPrimitive<C>
+where
+    C: Curve,
+    FixedSignatureSize<C::ScalarSize>: ArrayLength<u8>,
+{
+    /// Verify the prehashed message against the provided signature
+    ///
+    /// Accepts the following arguments:
+    ///
+    /// - `verify_key`: public key to verify the signature against
+    /// - `hashed_msg`: prehashed message to be verified
+    /// - `signature`: signature to be verified against the key and message
+    fn verify_prehashed(
+        &self,
+        hashed_msg: &ScalarBytes<C::ScalarSize>,
+        signature: &FixedSignature<C>,
+    ) -> Result<(), Error>;
+}
diff --git a/ecdsa/src/lib.rs b/ecdsa/src/lib.rs
index 386abd23..ebc57157 100644
--- a/ecdsa/src/lib.rs
+++ b/ecdsa/src/lib.rs
@@ -36,11 +36,10 @@
 
 pub mod asn1_signature;
 mod convert;
-pub mod curve;
 pub mod fixed_signature;
-#[cfg(feature = "test-vectors")]
-#[cfg_attr(docsrs, doc(cfg(feature = "test-vectors")))]
-pub mod test_vectors;
+
+#[cfg(feature = "hazmat")]
+pub mod hazmat;
 
 pub use self::{asn1_signature::Asn1Signature, fixed_signature::FixedSignature};
 
diff --git a/ecdsa/src/test_vectors.rs b/ecdsa/src/test_vectors.rs
deleted file mode 100644
index c1130dcd..00000000
--- a/ecdsa/src/test_vectors.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-//! ECDSA test vectors
-
-pub mod nistp256;
-pub mod nistp384;
-pub mod secp256k1;
-
-/// ECDSA test vector
-pub struct TestVector {
-    /// Secret key
-    pub sk: &'static [u8],
-
-    /// Public key
-    pub pk: &'static [u8],
-
-    /// Nonce (i.e. ECDSA `k` value)
-    pub nonce: Option<&'static [u8]>,
-
-    /// Message
-    pub msg: &'static [u8],
-
-    /// Signature
-    pub sig: &'static [u8],
-}
diff --git a/ecdsa/src/test_vectors/nistp256.rs b/ecdsa/src/test_vectors/nistp256.rs
deleted file mode 100644
index ef3516a7..00000000
--- a/ecdsa/src/test_vectors/nistp256.rs
+++ /dev/null
@@ -1,116 +0,0 @@
-//! ECDSA test vectors for the NIST P-256 elliptic curve
-//!
-//! Sourced from NIST's CAVP web site (FIPS 186-4 ECDSA Test Vectors):
-//!
-//! <https://csrc.nist.gov/Projects/Cryptographic-Algorithm-Validation-Program/Digital-Signatures>
-
-use super::TestVector;
-
-/// ECDSA P-256 test vectors from NIST's Cryptographic Algorithm Validation Program
-pub const SHA256_FIXED_SIZE_TEST_VECTORS: &[TestVector] = &[
-    TestVector {
-        sk: b"\x51\x9b\x42\x3d\x71\x5f\x8b\x58\x1f\x4f\xa8\xee\x59\xf4\x77\x1a\x5b\x44\xc8\x13\x0b\x4e\x3e\xac\xca\x54\xa5\x6d\xda\x72\xb4\x64",
-        pk: b"\x1c\xcb\xe9\x1c\x07\x5f\xc7\xf4\xf0\x33\xbf\xa2\x48\xdb\x8f\xcc\xd3\x56\x5d\xe9\x4b\xbf\xb1\x2f\x3c\x59\xff\x46\xc2\x71\xbf\x83\xce\x40\x14\xc6\x88\x11\xf9\xa2\x1a\x1f\xdb\x2c\x0e\x61\x13\xe0\x6d\xb7\xca\x93\xb7\x40\x4e\x78\xdc\x7c\xcd\x5c\xa8\x9a\x4c\xa9",
-        nonce: Some(b"\x94\xa1\xbb\xb1\x4b\x90\x6a\x61\xa2\x80\xf2\x45\xf9\xe9\x3c\x7f\x3b\x4a\x62\x47\x82\x4f\x5d\x33\xb9\x67\x07\x87\x64\x2a\x68\xde"),
-        msg: b"\x59\x05\x23\x88\x77\xc7\x74\x21\xf7\x3e\x43\xee\x3d\xa6\xf2\xd9\xe2\xcc\xad\x5f\xc9\x42\xdc\xec\x0c\xbd\x25\x48\x29\x35\xfa\xaf\x41\x69\x83\xfe\x16\x5b\x1a\x04\x5e\xe2\xbc\xd2\xe6\xdc\xa3\xbd\xf4\x6c\x43\x10\xa7\x46\x1f\x9a\x37\x96\x0c\xa6\x72\xd3\xfe\xb5\x47\x3e\x25\x36\x05\xfb\x1d\xdf\xd2\x80\x65\xb5\x3c\xb5\x85\x8a\x8a\xd2\x81\x75\xbf\x9b\xd3\x86\xa5\xe4\x71\xea\x7a\x65\xc1\x7c\xc9\x34\xa9\xd7\x91\xe9\x14\x91\xeb\x37\x54\xd0\x37\x99\x79\x0f\xe2\xd3\x08\xd1\x61\x46\xd5\xc9\xb0\xd0\xde\xbd\x97\xd7\x9c\xe8",
-        sig: b"\xf3\xac\x80\x61\xb5\x14\x79\x5b\x88\x43\xe3\xd6\x62\x95\x27\xed\x2a\xfd\x6b\x1f\x6a\x55\x5a\x7a\xca\xbb\x5e\x6f\x79\xc8\xc2\xac\x8b\xf7\x78\x19\xca\x05\xa6\xb2\x78\x6c\x76\x26\x2b\xf7\x37\x1c\xef\x97\xb2\x18\xe9\x6f\x17\x5a\x3c\xcd\xda\x2a\xcc\x05\x89\x03",
-    },
-    TestVector {
-        sk: b"\x0f\x56\xdb\x78\xca\x46\x0b\x05\x5c\x50\x00\x64\x82\x4b\xed\x99\x9a\x25\xaa\xf4\x8e\xbb\x51\x9a\xc2\x01\x53\x7b\x85\x47\x98\x13",
-        pk: b"\xe2\x66\xdd\xfd\xc1\x26\x68\xdb\x30\xd4\xca\x3e\x8f\x77\x49\x43\x2c\x41\x60\x44\xf2\xd2\xb8\xc1\x0b\xf3\xd4\x01\x2a\xef\xfa\x8a\xbf\xa8\x64\x04\xa2\xe9\xff\xe6\x7d\x47\xc5\x87\xef\x7a\x97\xa7\xf4\x56\xb8\x63\xb4\xd0\x2c\xfc\x69\x28\x97\x3a\xb5\xb1\xcb\x39",
-        nonce: Some(b"\x6d\x3e\x71\x88\x2c\x3b\x83\xb1\x56\xbb\x14\xe0\xab\x18\x4a\xa9\xfb\x72\x80\x68\xd3\xae\x9f\xac\x42\x11\x87\xae\x0b\x2f\x34\xc6"),
-        msg: b"\xc3\x5e\x2f\x09\x25\x53\xc5\x57\x72\x92\x6b\xdb\xe8\x7c\x97\x96\x82\x7d\x17\x02\x4d\xbb\x92\x33\xa5\x45\x36\x6e\x2e\x59\x87\xdd\x34\x4d\xeb\x72\xdf\x98\x71\x44\xb8\xc6\xc4\x3b\xc4\x1b\x65\x4b\x94\xcc\x85\x6e\x16\xb9\x6d\x7a\x82\x1c\x8e\xc0\x39\xb5\x03\xe3\xd8\x67\x28\xc4\x94\xa9\x67\xd8\x30\x11\xa0\xe0\x90\xb5\xd5\x4c\xd4\x7f\x4e\x36\x6c\x09\x12\xbc\x80\x8f\xbb\x2e\xa9\x6e\xfa\xc8\x8f\xb3\xeb\xec\x93\x42\x73\x8e\x22\x5f\x7c\x7c\x2b\x01\x1c\xe3\x75\xb5\x66\x21\xa2\x06\x42\xb4\xd3\x6e\x06\x0d\xb4\x52\x4a\xf1",
-        sig: b"\x97\x6d\x3a\x4e\x9d\x23\x32\x6d\xc0\xba\xa9\xfa\x56\x0b\x7c\x4e\x53\xf4\x28\x64\xf5\x08\x48\x3a\x64\x73\xb6\xa1\x10\x79\xb2\xdb\x1b\x76\x6e\x9c\xeb\x71\xba\x6c\x01\xdc\xd4\x6e\x0a\xf4\x62\xcd\x4c\xfa\x65\x2a\xe5\x01\x7d\x45\x55\xb8\xee\xef\xe3\x6e\x19\x32",
-    },
-    TestVector {
-        sk: b"\xe2\x83\x87\x12\x39\x83\x7e\x13\xb9\x5f\x78\x9e\x6e\x1a\xf6\x3b\xf6\x1c\x91\x8c\x99\x2e\x62\xbc\xa0\x40\xd6\x4c\xad\x1f\xc2\xef",
-        pk: b"\x74\xcc\xd8\xa6\x2f\xba\x0e\x66\x7c\x50\x92\x9a\x53\xf7\x8c\x21\xb8\xff\x0c\x3c\x73\x7b\x0b\x40\xb1\x75\x0b\x23\x02\xb0\xbd\xe8\x29\x07\x4e\x21\xf3\xa0\xef\x88\xb9\xef\xdf\x10\xd0\x6a\xa4\xc2\x95\xcc\x16\x71\xf7\x58\xca\x0e\x4c\xd1\x08\x80\x3d\x0f\x26\x14",
-        nonce: Some(b"\xad\x5e\x88\x7e\xb2\xb3\x80\xb8\xd8\x28\x0a\xd6\xe5\xff\x8a\x60\xf4\xd2\x62\x43\xe0\x12\x4c\x2f\x31\xa2\x97\xb5\xd0\x83\x5d\xe2"),
-        msg: b"\x3c\x05\x4e\x33\x3a\x94\x25\x9c\x36\xaf\x09\xab\x5b\x4f\xf9\xbe\xb3\x49\x2f\x8d\x5b\x42\x82\xd1\x68\x01\xda\xcc\xb2\x9f\x70\xfe\x61\xa0\xb3\x7f\xfe\xf5\xc0\x4c\xd1\xb7\x0e\x85\xb1\xf5\x49\xa1\xc4\xdc\x67\x29\x85\xe5\x0f\x43\xea\x03\x7e\xfa\x99\x64\xf0\x96\xb5\xf6\x2f\x7f\xfd\xf8\xd6\xbf\xb2\xcc\x85\x95\x58\xf5\xa3\x93\xcb\x94\x9d\xbd\x48\xf2\x69\x34\x3b\x52\x63\xdc\xdb\x9c\x55\x6e\xca\x07\x4f\x2e\x98\xe6\xd9\x4c\x2c\x29\xa6\x77\xaf\xaf\x80\x6e\xdf\x79\xb1\x5a\x3f\xcd\x46\xe7\x06\x7b\x76\x69\xf8\x31\x88\xee",
-        sig: b"\x35\xfb\x60\xf5\xca\x0f\x3c\xa0\x85\x42\xfb\x3c\xc6\x41\xc8\x26\x3a\x2c\xab\x7a\x90\xee\x6a\x5e\x15\x83\xfa\xc2\xbb\x6f\x6b\xd1\xee\x59\xd8\x1b\xc9\xdb\x10\x55\xcc\x0e\xd9\x7b\x15\x9d\x87\x84\xaf\x04\xe9\x85\x11\xd0\xa9\xa4\x07\xb9\x9b\xb2\x92\x57\x2e\x96",
-    },
-    TestVector {
-        sk: b"\xa3\xd2\xd3\xb7\x59\x6f\x65\x92\xce\x98\xb4\xbf\xe1\x0d\x41\x83\x7f\x10\x02\x7a\x90\xd7\xbb\x75\x34\x94\x90\x01\x8c\xf7\x2d\x07",
-        pk: b"\x32\x2f\x80\x37\x1b\xf6\xe0\x44\xbc\x49\x39\x1d\x97\xc1\x71\x4a\xb8\x7f\x99\x0b\x94\x9b\xc1\x78\xcb\x7c\x43\xb7\xc2\x2d\x89\xe1\x3c\x15\xd5\x4a\x5c\xc6\xb9\xf0\x9d\xe8\x45\x7e\x87\x3e\xb3\xde\xb1\xfc\xeb\x54\xb0\xb2\x95\xda\x60\x50\x29\x4f\xae\x7f\xd9\x99",
-        nonce: Some(b"\x24\xfc\x90\xe1\xda\x13\xf1\x7e\xf9\xfe\x84\xcc\x96\xb9\x47\x1e\xd1\xaa\xac\x17\xe3\xa4\xba\xe3\x3a\x11\x5d\xf4\xe5\x83\x4f\x18"),
-        msg: b"\x09\x89\x12\x24\x10\xd5\x22\xaf\x64\xce\xb0\x7d\xa2\xc8\x65\x21\x90\x46\xb4\xc3\xd9\xd9\x9b\x01\x27\x8c\x07\xff\x63\xea\xf1\x03\x9c\xb7\x87\xae\x9e\x2d\xd4\x64\x36\xcc\x04\x15\xf2\x80\xc5\x62\xbe\xbb\x83\xa2\x3e\x63\x9e\x47\x6a\x02\xec\x8c\xff\x7e\xa0\x6c\xd1\x2c\x86\xdc\xc3\xad\xef\xbf\x1a\x9e\x9a\x9b\x66\x46\xc7\x59\x9e\xc6\x31\xb0\xda\x9a\x60\xde\xbe\xb9\xb3\xe1\x93\x24\x97\x7f\x3b\x4f\x36\x89\x2c\x8a\x38\x67\x1c\x8e\x1c\xc8\xe5\x0f\xcd\x50\xf9\xe5\x1d\xea\xf9\x82\x72\xf9\x26\x6f\xc7\x02\xe4\xe5\x7c\x30",
-        sig: b"\xd7\xc5\x62\x37\x0a\xf6\x17\xb5\x81\xc8\x4a\x24\x68\xcc\x8b\xd5\x0b\xb1\xcb\xf3\x22\xde\x41\xb7\x88\x7c\xe0\x7c\x0e\x58\x84\xca\xb4\x6d\x9f\x2d\x8c\x4b\xf8\x35\x46\xff\x17\x8f\x1d\x78\x93\x7c\x00\x8d\x64\xe8\xec\xc5\xcb\xb8\x25\xcb\x21\xd9\x4d\x67\x0d\x89",
-    },
-    TestVector {
-        sk: b"\x53\xa0\xe8\xa8\xfe\x93\xdb\x01\xe7\xae\x94\xe1\xa9\x88\x2a\x10\x2e\xbd\x07\x9b\x3a\x53\x58\x27\xd5\x83\x62\x6c\x27\x2d\x28\x0d",
-        pk: b"\x1b\xce\xc4\x57\x0e\x1e\xc2\x43\x65\x96\xb8\xde\xd5\x8f\x60\xc3\xb1\xeb\xc6\xa4\x03\xbc\x55\x43\x04\x0b\xa8\x29\x63\x05\x72\x44\x8a\xf6\x2a\x4c\x68\x3f\x09\x6b\x28\x55\x83\x20\x73\x7b\xf8\x3b\x99\x59\xa4\x6a\xd2\x52\x10\x04\xef\x74\xcf\x85\xe6\x74\x94\xe1",
-        nonce: Some(b"\x5d\x83\x3e\x8d\x24\xcc\x7a\x40\x2d\x7e\xe7\xec\x85\x2a\x35\x87\xcd\xde\xb4\x83\x58\xce\xa7\x1b\x0b\xed\xb8\xfa\xbe\x84\xe0\xc4"),
-        msg: b"\xdc\x66\xe3\x9f\x9b\xbf\xd9\x86\x53\x18\x53\x1f\xfe\x92\x07\xf9\x34\xfa\x61\x5a\x5b\x28\x57\x08\xa5\xe9\xc4\x6b\x77\x75\x15\x0e\x81\x8d\x7f\x24\xd2\xa1\x23\xdf\x36\x72\xff\xf2\x09\x4e\x3f\xd3\xdf\x6f\xbe\x25\x9e\x39\x89\xdd\x5e\xdf\xcc\xcb\xe7\xd4\x5e\x26\xa7\x75\xa5\xc4\x32\x9a\x08\x4f\x05\x7c\x42\xc1\x3f\x32\x48\xe3\xfd\x6f\x0c\x76\x67\x8f\x89\x0f\x51\x3c\x32\x29\x2d\xd3\x06\xea\xa8\x4a\x59\xab\xe3\x4b\x16\xcb\x5e\x38\xd0\xe8\x85\x52\x5d\x10\x33\x6c\xa4\x43\xe1\x68\x2a\xa0\x4a\x7a\xf8\x32\xb0\xee\xe4\xe7",
-        sig: b"\x18\xca\xaf\x7b\x66\x35\x07\xa8\xbc\xd9\x92\xb8\x36\xde\xc9\xdc\x57\x03\xc0\x80\xaf\x5e\x51\xdf\xa3\xa9\xa7\xc3\x87\x18\x26\x04\x77\xc6\x89\x28\xac\x3b\x88\xd9\x85\xfb\x43\xfb\x61\x5f\xb7\xff\x45\xc1\x8b\xa5\xc8\x1a\xf7\x96\xc6\x13\xdf\xa9\x83\x52\xd2\x9c",
-    },
-    TestVector {
-        sk: b"\x4a\xf1\x07\xe8\xe2\x19\x4c\x83\x0f\xfb\x71\x2a\x65\x51\x1b\xc9\x18\x6a\x13\x30\x07\x85\x5b\x49\xab\x4b\x38\x33\xae\xfc\x4a\x1d",
-        pk: b"\xa3\x2e\x50\xbe\x3d\xae\x2c\x8b\xa3\xf5\xe4\xbd\xae\x14\xcf\x76\x45\x42\x0d\x42\x5e\xad\x94\x03\x6c\x22\xdd\x6c\x4f\xc5\x9e\x00\xd6\x23\xbf\x64\x11\x60\xc2\x89\xd6\x74\x2c\x62\x57\xae\x6b\xa5\x74\x44\x6d\xd1\xd0\xe7\x4d\xb3\xaa\xa8\x09\x00\xb7\x8d\x4a\xe9",
-        nonce: Some(b"\xe1\x8f\x96\xf8\x4d\xfa\x2f\xd3\xcd\xfa\xec\x91\x59\xd4\xc3\x38\xcd\x54\xad\x31\x41\x34\xf0\xb3\x1e\x20\x59\x1f\xc2\x38\xd0\xab"),
-        msg: b"\x60\x09\x74\xe7\xd8\xc5\x50\x8e\x2c\x1a\xab\x07\x83\xad\x0d\x7c\x44\x94\xab\x2b\x4d\xa2\x65\xc2\xfe\x49\x64\x21\xc4\xdf\x23\x8b\x0b\xe2\x5f\x25\x65\x91\x57\xc8\xa2\x25\xfb\x03\x95\x36\x07\xf7\xdf\x99\x6a\xcf\xd4\x02\xf1\x47\xe3\x7a\xee\x2f\x16\x93\xe3\xbf\x1c\x35\xea\xb3\xae\x36\x0a\x2b\xd9\x1d\x04\x62\x2e\xa4\x7f\x83\xd8\x63\xd2\xdf\xec\xb6\x18\xe8\xb8\xbd\xc3\x9e\x17\xd1\x5d\x67\x2e\xee\x03\xbb\x4c\xe2\xcc\x5c\xf6\xb2\x17\xe5\xfa\xf3\xf3\x36\xfd\xd8\x7d\x97\x2d\x3a\x8b\x8a\x59\x3b\xa8\x59\x55\xcc\x9d\x71",
-        sig: b"\x85\x24\xc5\x02\x4e\x2d\x9a\x73\xbd\xe8\xc7\x2d\x91\x29\xf5\x78\x73\xbb\xad\x0e\xd0\x52\x15\xa3\x72\xa8\x4f\xdb\xc7\x8f\x2e\x68\xd1\x8c\x2c\xaf\x3b\x10\x72\xf8\x70\x64\xec\x5e\x89\x53\xf5\x13\x01\xca\xda\x03\x46\x9c\x64\x02\x44\x76\x03\x28\xeb\x5a\x05\xcb",
-    },
-    TestVector {
-        sk: b"\x78\xdf\xaa\x09\xf1\x07\x68\x50\xb3\xe2\x06\xe4\x77\x49\x4c\xdd\xcf\xb8\x22\xaa\xa0\x12\x84\x75\x05\x35\x92\xc4\x8e\xba\xf4\xab",
-        pk: b"\x8b\xcf\xe2\xa7\x21\xca\x6d\x75\x39\x68\xf5\x64\xec\x43\x15\xbe\x48\x57\xe2\x8b\xef\x19\x08\xf6\x1a\x36\x6b\x1f\x03\xc9\x74\x79\x0f\x67\x57\x6a\x30\xb8\xe2\x0d\x42\x32\xd8\x53\x0b\x52\xfb\x4c\x89\xcb\xc5\x89\xed\xe2\x91\xe4\x99\xdd\xd1\x5f\xe8\x70\xab\x96",
-        nonce: Some(b"\x29\x55\x44\xdb\xb2\xda\x3d\xa1\x70\x74\x1c\x9b\x2c\x65\x51\xd4\x0a\xf7\xed\x4e\x89\x14\x45\xf1\x1a\x02\xb6\x6a\x5c\x25\x8a\x77"),
-        msg: b"\xdf\xa6\xcb\x9b\x39\xad\xda\x6c\x74\xcc\x8b\x2a\x8b\x53\xa1\x2c\x49\x9a\xb9\xde\xe0\x1b\x41\x23\x64\x2b\x4f\x11\xaf\x33\x6a\x91\xa5\xc9\xce\x05\x20\xeb\x23\x95\xa6\x19\x0e\xcb\xf6\x16\x9c\x4c\xba\x81\x94\x1d\xe8\xe7\x6c\x9c\x90\x8e\xb8\x43\xb9\x8c\xe9\x5e\x0d\xa2\x9c\x5d\x43\x88\x04\x02\x64\xe0\x5e\x07\x03\x0a\x57\x7c\xc5\xd1\x76\x38\x71\x54\xea\xba\xe2\xaf\x52\xa8\x3e\x85\xc6\x1c\x7c\x61\xda\x93\x0c\x9b\x19\xe4\x5d\x7e\x34\xc8\x51\x6d\xc3\xc2\x38\xfd\xdd\x6e\x45\x0a\x77\x45\x5d\x53\x4c\x48\xa1\x52\x01\x0b",
-        sig: b"\xc5\xa1\x86\xd7\x2d\xf4\x52\x01\x54\x80\xf7\xf3\x38\x97\x0b\xfe\x82\x50\x87\xf0\x5c\x00\x88\xd9\x53\x05\xf8\x7a\xac\xc9\xb2\x54\x84\xa5\x8f\x9e\x9d\x9e\x73\x53\x44\xb3\x16\xb1\xaa\x1a\xb5\x18\x56\x65\xb8\x51\x47\xdc\x82\xd9\x2e\x96\x9d\x7b\xee\x31\xca\x30",
-    },
-    TestVector {
-        sk: b"\x80\xe6\x92\xe3\xeb\x9f\xcd\x8c\x7d\x44\xe7\xde\x9f\x7a\x59\x52\x68\x64\x07\xf9\x00\x25\xa1\xd8\x7e\x52\xc7\x09\x6a\x62\x61\x8a",
-        pk: b"\xa8\x8b\xc8\x43\x02\x79\xc8\xc0\x40\x0a\x77\xd7\x51\xf2\x6c\x0a\xbc\x93\xe5\xde\x4a\xd9\xa4\x16\x63\x57\x95\x2f\xe0\x41\xe7\x67\x2d\x36\x5a\x1e\xef\x25\xea\xd5\x79\xcc\x9a\x06\x9b\x6a\xbc\x1b\x16\xb8\x1c\x35\xf1\x87\x85\xce\x26\xa1\x0b\xa6\xd1\x38\x11\x85",
-        nonce: Some(b"\x7c\x80\xfd\x66\xd6\x2c\xc0\x76\xce\xf2\xd0\x30\xc1\x7c\x0a\x69\xc9\x96\x11\x54\x9c\xb3\x2c\x4f\xf6\x62\x47\x5a\xdb\xe8\x4b\x22"),
-        msg: b"\x51\xd2\x54\x7c\xbf\xf9\x24\x31\x17\x4a\xa7\xfc\x73\x02\x13\x95\x19\xd9\x80\x71\xc7\x55\xff\x1c\x92\xe4\x69\x4b\x58\x58\x7e\xa5\x60\xf7\x2f\x32\xfc\x6d\xd4\xde\xe7\xd2\x2b\xb7\x38\x73\x81\xd0\x25\x6e\x28\x62\xd0\x64\x4c\xdf\x2c\x27\x7c\x5d\x74\x0f\xa0\x89\x83\x0e\xb5\x2b\xf7\x9d\x1e\x75\xb8\x59\x6e\xcf\x0e\xa5\x8a\x0b\x9d\xf6\x1e\x0c\x97\x54\xbf\xcd\x62\xef\xab\x6e\xa1\xbd\x21\x6b\xf1\x81\xc5\x59\x3d\xa7\x9f\x10\x13\x5a\x9b\xc6\xe1\x64\xf1\x85\x4b\xc8\x85\x97\x34\x34\x1a\xad\x23\x7b\xa2\x9a\x81\xa3\xfc\x8b",
-        sig: b"\x9d\x0c\x6a\xfb\x6d\xf3\xbc\xed\x45\x5b\x45\x9c\xc2\x13\x87\xe1\x49\x29\x39\x26\x64\xbb\x87\x41\xa3\x69\x3a\x17\x95\xca\x69\x02\xd7\xf9\xdd\xd1\x91\xf1\xf4\x12\x86\x94\x29\x20\x9e\xe3\x81\x4c\x75\xc7\x2f\xa4\x6a\x9c\xcc\xf8\x04\xa2\xf5\xcc\x0b\x7e\x73\x9f",
-    },
-    TestVector {
-        sk: b"\x5e\x66\x6c\x0d\xb0\x21\x4c\x3b\x62\x7a\x8e\x48\x54\x1c\xc8\x4a\x8b\x6f\xd1\x5f\x30\x0d\xa4\xdf\xf5\xd1\x8a\xec\x6c\x55\xb8\x81",
-        pk: b"\x1b\xc4\x87\x57\x0f\x04\x0d\xc9\x41\x96\xc9\xbe\xfe\x8a\xb2\xb6\xde\x77\x20\x8b\x1f\x38\xbd\xaa\xe2\x8f\x96\x45\xc4\xd2\xbc\x3a\xec\x81\x60\x2a\xbd\x83\x45\xe7\x18\x67\xc8\x21\x03\x13\x73\x78\x65\xb8\xaa\x18\x68\x51\xe1\xb4\x8e\xac\xa1\x40\x32\x0f\x5d\x8f",
-        nonce: Some(b"\x2e\x76\x25\xa4\x88\x74\xd8\x6c\x9e\x46\x7f\x89\x0a\xaa\x7c\xd6\xeb\xdf\x71\xc0\x10\x2b\xfd\xcf\xa2\x45\x65\xd6\xaf\x3f\xdc\xe9"),
-        msg: b"\x55\x8c\x2a\xc1\x30\x26\x40\x2b\xad\x4a\x0a\x83\xeb\xc9\x46\x8e\x50\xf7\xff\xab\x06\xd6\xf9\x81\xe5\xdb\x1d\x08\x20\x98\x06\x5b\xcf\xf6\xf2\x1a\x7a\x74\x55\x8b\x1e\x86\x12\x91\x4b\x8b\x5a\x0a\xa2\x8e\xd5\xb5\x74\xc3\x6a\xc4\xea\x58\x68\x43\x2a\x62\xbb\x8e\xf0\x69\x5d\x27\xc1\xe3\xce\xaf\x75\xc7\xb2\x51\xc6\x5d\xdb\x26\x86\x96\xf0\x7c\x16\xd2\x76\x79\x73\xd8\x5b\xeb\x44\x3f\x21\x1e\x64\x45\xe7\xfe\x5d\x46\xf0\xdc\xe7\x0d\x58\xa4\xcd\x9f\xe7\x06\x88\xc0\x35\x68\x8e\xa8\xc6\xba\xec\x65\xa5\xfc\x7e\x2c\x93\xe8",
-        sig: b"\x2f\x9e\x2b\x4e\x9f\x74\x7c\x65\x7f\x70\x5b\xff\xd1\x24\xee\x17\x8b\xbc\x53\x91\xc8\x6d\x05\x67\x17\xb1\x40\xc1\x53\x57\x0f\xd9\xf5\x41\x3b\xfd\x85\x94\x9d\xa8\xd8\x3d\xe8\x3a\xb0\xd1\x9b\x29\x86\x61\x3e\x22\x4d\x19\x01\xd7\x69\x19\xde\x23\xcc\xd0\x31\x99",
-    },
-    TestVector {
-        sk: b"\xf7\x3f\x45\x52\x71\xc8\x77\xc4\xd5\x33\x46\x27\xe3\x7c\x27\x8f\x68\xd1\x43\x01\x4b\x0a\x05\xaa\x62\xf3\x08\xb2\x10\x1c\x53\x08",
-        pk: b"\xb8\x18\x8b\xd6\x87\x01\xfc\x39\x6d\xab\x53\x12\x5d\x4d\x28\xea\x33\xa9\x1d\xaf\x6d\x21\x48\x5f\x47\x70\xf6\xea\x8c\x56\x5d\xde\x42\x3f\x05\x88\x10\xf2\x77\xf8\xfe\x07\x6f\x6d\xb5\x6e\x92\x85\xa1\xbf\x2c\x2a\x1d\xae\x14\x50\x95\xed\xd9\xc0\x49\x70\xbc\x4a",
-        nonce: Some(b"\x62\xf8\x66\x5f\xd6\xe2\x6b\x3f\xa0\x69\xe8\x52\x81\x77\x7a\x9b\x1f\x0d\xfd\x2c\x0b\x9f\x54\xa0\x86\xd0\xc1\x09\xff\x9f\xd6\x15"),
-        msg: b"\x4d\x55\xc9\x9e\xf6\xbd\x54\x62\x16\x62\xc3\xd1\x10\xc3\xcb\x62\x7c\x03\xd6\x31\x13\x93\xb2\x64\xab\x97\xb9\x0a\x4b\x15\x21\x4a\x55\x93\xba\x25\x10\xa5\x3d\x63\xfb\x34\xbe\x25\x1f\xac\xb6\x97\xc9\x73\xe1\x1b\x66\x5c\xb7\x92\x0f\x16\x84\xb0\x03\x1b\x4d\xd3\x70\xcb\x92\x7c\xa7\x16\x8b\x0b\xf8\xad\x28\x5e\x05\xe9\xe3\x1e\x34\xbc\x24\x02\x47\x39\xfd\xc1\x0b\x78\x58\x6f\x29\xef\xf9\x44\x12\x03\x4e\x3b\x60\x6e\xd8\x50\xec\x2c\x19\x00\xe8\xe6\x81\x51\xfc\x4a\xee\x5a\xde\xbb\x06\x6e\xb6\xda\x4e\xaa\x56\x81\x37\x8e",
-        sig: b"\x1c\xc6\x28\x53\x3d\x00\x04\xb2\xb2\x0e\x7f\x4b\xaa\xd0\xb8\xbb\x5e\x06\x73\xdb\x15\x9b\xbc\xcf\x92\x49\x1a\xef\x61\xfc\x96\x20\x88\x0e\x0b\xbf\x82\xa8\xcf\x81\x8e\xd4\x6b\xa0\x3c\xf0\xfc\x6c\x89\x8e\x36\xfc\xa3\x6c\xc7\xfd\xb1\xd2\xdb\x75\x03\x63\x44\x30",
-    },
-    TestVector {
-        sk: b"\xb2\x0d\x70\x5d\x9b\xd7\xc2\xb8\xdc\x60\x39\x3a\x53\x57\xf6\x32\x99\x0e\x59\x9a\x09\x75\x57\x3a\xc6\x7f\xd8\x9b\x49\x18\x79\x06",
-        pk: b"\x51\xf9\x9d\x2d\x52\xd4\xa6\xe7\x34\x48\x4a\x01\x8b\x7c\xa2\xf8\x95\xc2\x92\x9b\x67\x54\xa3\xa0\x32\x24\xd0\x7a\xe6\x11\x66\xce\x47\x37\xda\x96\x3c\x6e\xf7\x24\x7f\xb8\x8d\x19\xf9\xb0\xc6\x67\xca\xc7\xfe\x12\x83\x7f\xda\xb8\x8c\x66\xf1\x0d\x3c\x14\xca\xd1",
-        nonce: Some(b"\x72\xb6\x56\xf6\xb3\x5b\x9c\xcb\xc7\x12\xc9\xf1\xf3\xb1\xa1\x4c\xbb\xeb\xae\xc4\x1c\x4b\xca\x8d\xa1\x8f\x49\x2a\x06\x2d\x6f\x6f"),
-        msg: b"\xf8\x24\x8a\xd4\x7d\x97\xc1\x8c\x98\x4f\x1f\x5c\x10\x95\x0d\xc1\x40\x47\x13\xc5\x6b\x6e\xa3\x97\xe0\x1e\x6d\xd9\x25\xe9\x03\xb4\xfa\xdf\xe2\xc9\xe8\x77\x16\x9e\x71\xce\x3c\x7f\xe5\xce\x70\xee\x42\x55\xd9\xcd\xc2\x6f\x69\x43\xbf\x48\x68\x78\x74\xde\x64\xf6\xcf\x30\xa0\x12\x51\x2e\x78\x7b\x88\x05\x9b\xbf\x56\x11\x62\xbd\xcc\x23\xa3\x74\x2c\x83\x5a\xc1\x44\xcc\x14\x16\x7b\x1b\xd6\x72\x7e\x94\x05\x40\xa9\xc9\x9f\x3c\xbb\x41\xfb\x1d\xcb\x00\xd7\x6d\xda\x04\x99\x58\x47\xc6\x57\xf4\xc1\x9d\x30\x3e\xb0\x9e\xb4\x8a",
-        sig: b"\x98\x86\xae\x46\xc1\x41\x5c\x3b\xc9\x59\xe8\x2b\x76\x0a\xd7\x60\xaa\xb6\x68\x85\xa8\x4e\x62\x0a\xa3\x39\xfd\xf1\x02\x46\x5c\x42\x2b\xf3\xa8\x0b\xc0\x4f\xaa\x35\xeb\xec\xc0\xf4\x86\x4a\xc0\x2d\x34\x9f\x6f\x12\x6e\x0f\x98\x85\x01\xb8\xd3\x07\x54\x09\xa2\x6c",
-    },
-    TestVector {
-        sk: b"\xd4\x23\x4b\xeb\xfb\xc8\x21\x05\x03\x41\xa3\x7e\x12\x40\xef\xe5\xe3\x37\x63\xcb\xbb\x2e\xf7\x6a\x1c\x79\xe2\x47\x24\xe5\xa5\xe7",
-        pk: b"\x8f\xb2\x87\xf0\x20\x2a\xd5\x7a\xe8\x41\xae\xa3\x5f\x29\xb2\xe1\xd5\x3e\x19\x6d\x0d\xdd\x9a\xec\x24\x81\x3d\x64\xc0\x92\x2f\xb7\x1f\x6d\xaf\xf1\xaa\x2d\xd2\xd6\xd3\x74\x16\x23\xee\xcb\x5e\x7b\x61\x29\x97\xa1\x03\x9a\xab\x2e\x5c\xf2\xde\x96\x9c\xfe\xa5\x73",
-        nonce: Some(b"\xd9\x26\xfe\x10\xf1\xbf\xd9\x85\x56\x10\xf4\xf5\xa3\xd6\x66\xb1\xa1\x49\x34\x40\x57\xe3\x55\x37\x37\x33\x72\xea\xd8\xb1\xa7\x78"),
-        msg: b"\x3b\x6e\xe2\x42\x59\x40\xb3\xd2\x40\xd3\x5b\x97\xb6\xdc\xd6\x1e\xd3\x42\x3d\x8e\x71\xa0\xad\xa3\x5d\x47\xb3\x22\xd1\x7b\x35\xea\x04\x72\xf3\x5e\xdd\x1d\x25\x2f\x87\xb8\xb6\x5e\xf4\xb7\x16\x66\x9f\xc9\xac\x28\xb0\x0d\x34\xa9\xd6\x6a\xd1\x18\xc9\xd9\x4e\x7f\x46\xd0\xb4\xf6\xc2\xb2\xd3\x39\xfd\x6b\xcd\x35\x12\x41\xa3\x87\xcc\x82\x60\x90\x57\x04\x8c\x12\xc4\xec\x3d\x85\xc6\x61\x97\x5c\x45\xb3\x00\xcb\x96\x93\x0d\x89\x37\x0a\x32\x7c\x98\xb6\x7d\xef\xaa\x89\x49\x7a\xa8\xef\x99\x4c\x77\xf1\x13\x0f\x75\x2f\x94\xa4",
-        sig: b"\x49\x0e\xfd\x10\x6b\xe1\x1f\xc3\x65\xc7\x46\x7e\xb8\x9b\x8d\x39\xe1\x5d\x65\x17\x53\x56\x77\x5d\xea\xb2\x11\x16\x3c\x25\x04\xcb\x64\x43\x00\xfc\x0d\xa4\xd4\x0f\xb8\xc6\xea\xd5\x10\xd1\x4f\x0b\xd4\xe1\x32\x1a\x46\x9e\x9c\x0a\x58\x14\x64\xc7\x18\x6b\x7a\xa7",
-    },
-    TestVector {
-        sk: b"\xb5\x8f\x52\x11\xdf\xf4\x40\x62\x6b\xb5\x6d\x0a\xd4\x83\x19\x3d\x60\x6c\xf2\x1f\x36\xd9\x83\x05\x43\x32\x72\x92\xf4\xd2\x5d\x8c",
-        pk: b"\x68\x22\x9b\x48\xc2\xfe\x19\xd3\xdb\x03\x4e\x4c\x15\x07\x7e\xb7\x47\x1a\x66\x03\x1f\x28\xa9\x80\x82\x18\x73\x91\x52\x98\xba\x76\x30\x3e\x8e\xe3\x74\x2a\x89\x3f\x78\xb8\x10\x99\x1d\xa6\x97\x08\x3d\xd8\xf1\x11\x28\xc4\x76\x51\xc2\x7a\x56\x74\x0a\x80\xc2\x4c",
-        nonce: Some(b"\xe1\x58\xbf\x4a\x2d\x19\xa9\x91\x49\xd9\xcd\xb8\x79\x29\x4c\xcb\x7a\xae\xae\x03\xd7\x5d\xdd\x61\x6e\xf8\xae\x51\xa6\xdc\x10\x71"),
-        msg: b"\xc5\x20\x4b\x81\xec\x0a\x4d\xf5\xb7\xe9\xfd\xa3\xdc\x24\x5f\x98\x08\x2a\xe7\xf4\xef\xe8\x19\x98\xdc\xaa\x28\x6b\xd4\x50\x7c\xa8\x40\xa5\x3d\x21\xb0\x1e\x90\x4f\x55\xe3\x8f\x78\xc3\x75\x7d\x5a\x5a\x4a\x44\xb1\xd5\xd4\xe4\x80\xbe\x3a\xfb\x5b\x39\x4a\x5d\x28\x40\xaf\x42\xb1\xb4\x08\x3d\x40\xaf\xbf\xe2\x2d\x70\x2f\x37\x0d\x32\xdb\xfd\x39\x2e\x12\x8e\xa4\x72\x4d\x66\xa3\x70\x1d\xa4\x1a\xe2\xf0\x3b\xb4\xd9\x1b\xb9\x46\xc7\x96\x94\x04\xcb\x54\x4f\x71\xeb\x7a\x49\xeb\x4c\x4e\xc5\x57\x99\xbd\xa1\xeb\x54\x51\x43\xa7",
-        sig: b"\xe6\x7a\x97\x17\xcc\xf9\x68\x41\x48\x9d\x65\x41\xf4\xf6\xad\xb1\x2d\x17\xb5\x9a\x6b\xef\x84\x7b\x61\x83\xb8\xfc\xf1\x6a\x32\xeb\x9a\xe6\xba\x6d\x63\x77\x06\x84\x9a\x6a\x9f\xc3\x88\xcf\x02\x32\xd8\x5c\x26\xea\x0d\x1f\xe7\x43\x7a\xdb\x48\xde\x58\x36\x43\x33",
-    },
-    TestVector {
-        sk: b"\x54\xc0\x66\x71\x1c\xdb\x06\x1e\xda\x07\xe5\x27\x5f\x7e\x95\xa9\x96\x2c\x67\x64\xb8\x4f\x6f\x1f\x3a\xb5\xa5\x88\xe0\xa2\xaf\xb1",
-        pk: b"\x0a\x7d\xbb\x8b\xf5\x0c\xb6\x05\xeb\x22\x68\xb0\x81\xf2\x6d\x6b\x08\xe0\x12\xf9\x52\xc4\xb7\x0a\x5a\x1e\x6e\x7d\x46\xaf\x98\xbb\xf2\x6d\xd7\xd7\x99\x93\x00\x62\x48\x08\x49\x96\x2c\xcf\x50\x04\xed\xcf\xd3\x07\xc0\x44\xf4\xe8\xf6\x67\xc9\xba\xa8\x34\xee\xae",
-        nonce: Some(b"\x64\x6f\xe9\x33\xe9\x6c\x3b\x8f\x9f\x50\x74\x98\xe9\x07\xfd\xd2\x01\xf0\x84\x78\xd0\x20\x2c\x75\x2a\x7c\x2c\xfe\xbf\x4d\x06\x1a"),
-        msg: b"\x72\xe8\x1f\xe2\x21\xfb\x40\x21\x48\xd8\xb7\xab\x03\x54\x9f\x11\x80\xbc\xc0\x3d\x41\xca\x59\xd7\x65\x38\x01\xf0\xba\x85\x3a\xdd\x1f\x6d\x29\xed\xd7\xf9\xab\xc6\x21\xb2\xd5\x48\xf8\xdb\xf8\x97\x9b\xd1\x66\x08\xd2\xd8\xfc\x32\x60\xb4\xeb\xc0\xdd\x42\x48\x24\x81\xd5\x48\xc7\x07\x57\x11\xb5\x75\x96\x49\xc4\x1f\x43\x9f\xad\x69\x95\x49\x56\xc9\x32\x68\x41\xea\x64\x92\x95\x68\x29\xf9\xe0\xdc\x78\x9f\x73\x63\x3b\x40\xf6\xac\x77\xbc\xae\x6d\xfc\x79\x30\xcf\xe8\x9e\x52\x6d\x16\x84\x36\x5c\x5b\x0b\xe2\x43\x7f\xdb\x01",
-        sig: b"\xb5\x3c\xe4\xda\x1a\xa7\xc0\xdc\x77\xa1\x89\x6a\xb7\x16\xb9\x21\x49\x9a\xed\x78\xdf\x72\x5b\x15\x04\xab\xa1\x59\x7b\xa0\xc6\x4b\xd7\xc2\x46\xdc\x7a\xd0\xe6\x77\x00\xc3\x73\xed\xcf\xdd\x1c\x0a\x04\x95\xfc\x95\x45\x49\xad\x57\x9d\xf6\xed\x14\x38\x84\x08\x51",
-    },
-    TestVector {
-        sk: b"\x34\xfa\x46\x82\xbf\x6c\xb5\xb1\x67\x83\xad\xcd\x18\xf0\xe6\x87\x9b\x92\x18\x5f\x76\xd7\xc9\x20\x40\x9f\x90\x4f\x52\x2d\xb4\xb1",
-        pk: b"\x10\x5d\x22\xd9\xc6\x26\x52\x0f\xac\xa1\x3e\x7c\xed\x38\x2d\xcb\xe9\x34\x98\x31\x5f\x00\xcc\x0a\xc3\x9c\x48\x21\xd0\xd7\x37\x37\x6c\x47\xf3\xcb\xbf\xa9\x7d\xfc\xeb\xe1\x62\x70\xb8\xc7\xd5\xd3\xa5\x90\x0b\x88\x8c\x42\x52\x0d\x75\x1e\x8f\xaf\x3b\x40\x1e\xf4",
-        nonce: Some(b"\xa6\xf4\x63\xee\x72\xc9\x49\x2b\xc7\x92\xfe\x98\x16\x31\x12\x83\x7a\xeb\xd0\x7b\xab\x7a\x84\xaa\xed\x05\xbe\x64\xdb\x30\x86\xf4"),
-        msg: b"\x21\x18\x8c\x3e\xdd\x5d\xe0\x88\xda\xcc\x10\x76\xb9\xe1\xbc\xec\xd7\x9d\xe1\x00\x3c\x24\x14\xc3\x86\x61\x73\x05\x4d\xc8\x2d\xde\x85\x16\x9b\xaa\x77\x99\x3a\xdb\x20\xc2\x69\xf6\x0a\x52\x26\x11\x18\x28\x57\x8b\xcc\x7c\x29\xe6\xe8\xd2\xda\xe8\x18\x06\x15\x2c\x8b\xa0\xc6\xad\xa1\x98\x6a\x19\x83\xeb\xee\xc1\x47\x3a\x73\xa0\x47\x95\xb6\x31\x9d\x48\x66\x2d\x40\x88\x1c\x17\x23\xa7\x06\xf5\x16\xfe\x75\x30\x0f\x92\x40\x8a\xa1\xdc\x6a\xe4\x28\x8d\x20\x46\xf2\x3c\x1a\xa2\xe5\x4b\x7f\xb6\x44\x8a\x0d\xa9\x22\xbd\x7f\x34",
-        sig: b"\x54\x2c\x40\xa1\x81\x40\xa6\x26\x6d\x6f\x02\x86\xe2\x4e\x9a\x7b\xad\x76\x50\xe7\x2e\xf0\xe2\x13\x1e\x62\x9c\x07\x6d\x96\x26\x63\x4f\x7f\x65\x30\x5e\x24\xa6\xbb\xb5\xcf\xf7\x14\xba\x8f\x5a\x2c\xee\x5b\xdc\x89\xba\x8d\x75\xdc\xbf\x21\x96\x6c\xe3\x8e\xb6\x6f",
-    },
-];
diff --git a/ecdsa/src/test_vectors/nistp384.rs b/ecdsa/src/test_vectors/nistp384.rs
deleted file mode 100644
index 298fc3d2..00000000
--- a/ecdsa/src/test_vectors/nistp384.rs
+++ /dev/null
@@ -1,116 +0,0 @@
-//! ECDSA test vectors for the NIST P-384 elliptic curve
-//!
-//! Sourced from NIST's CAVP web site (FIPS 186-4 ECDSA Test Vectors):
-//!
-//! <https://csrc.nist.gov/Projects/Cryptographic-Algorithm-Validation-Program/Digital-Signatures>
-
-use super::TestVector;
-
-/// ECDSA P-384 test vectors from NIST's Cryptographic Algorithm Validation Program
-pub const SHA384_FIXED_SIZE_TEST_VECTORS: &[TestVector] = &[
-    TestVector {
-        sk: b"\x20\x1b\x43\x2d\x8d\xf1\x43\x24\x18\x2d\x62\x61\xdb\x3e\x4b\x3f\x46\xa8\x28\x44\x82\xd5\x2e\x37\x0d\xa4\x1e\x6c\xbd\xf4\x5e\xc2\x95\x2f\x5d\xb7\xcc\xbc\xe3\xbc\x29\x44\x9f\x4f\xb0\x80\xac\x97",
-        pk: b"\xc2\xb4\x79\x44\xfb\x5d\xe3\x42\xd0\x32\x85\x88\x01\x77\xca\x5f\x7d\x0f\x2f\xca\xd7\x67\x8c\xce\x42\x29\xd6\xe1\x93\x2f\xca\xc1\x1b\xfc\x3c\x3e\x97\xd9\x42\xa3\xc5\x6b\xf3\x41\x23\x01\x3d\xbf\x37\x25\x79\x06\xa8\x22\x38\x66\xed\xa0\x74\x3c\x51\x96\x16\xa7\x6a\x75\x8a\xe5\x8a\xee\x81\xc5\xfd\x35\xfb\xf3\xa8\x55\xb7\x75\x4a\x36\xd4\xa0\x67\x2d\xf9\x5d\x6c\x44\xa8\x1c\xf7\x62\x0c\x2d",
-        nonce: Some(b"\xdc\xed\xab\xf8\x59\x78\xe0\x90\xf7\x33\xc6\xe1\x66\x46\xfa\x34\xdf\x9d\xed\x6e\x5c\xe2\x8c\x66\x76\xa0\x0f\x58\xa2\x52\x83\xdb\x88\x85\xe1\x6c\xe5\xbf\x97\xf9\x17\xc8\x1e\x1f\x25\xc9\xc7\x71"),
-        msg: b"\x6b\x45\xd8\x80\x37\x39\x2e\x13\x71\xd9\xfd\x1c\xd1\x74\xe9\xc1\x83\x8d\x11\xc3\xd6\x13\x3d\xc1\x7e\x65\xfa\x0c\x48\x5d\xcc\xa9\xf5\x2d\x41\xb6\x01\x61\x24\x60\x39\xe4\x2e\xc7\x84\xd4\x94\x00\xbf\xfd\xb5\x14\x59\xf5\xde\x65\x40\x91\x30\x1a\x09\x37\x8f\x93\x46\x4d\x52\x11\x8b\x48\xd4\x4b\x30\xd7\x81\xeb\x1d\xbe\xd0\x9d\xa1\x1f\xb4\xc8\x18\xdb\xd4\x42\xd1\x61\xab\xa4\xb9\xed\xc7\x9f\x05\xe4\xb7\xe4\x01\x65\x13\x95\xb5\x3b\xd8\xb5\xbd\x3f\x2a\xaa\x6a\x00\x87\x7f\xa9\xb4\x5c\xad\xb8\xe6\x48\x55\x0b\x4c\x6c\xbe",
-        sig: b"\x50\x83\x5a\x92\x51\xba\xd0\x08\x10\x61\x77\xef\x00\x4b\x09\x1a\x1e\x42\x35\xcd\x0d\xa8\x4f\xff\x54\x54\x2b\x0e\xd7\x55\xc1\xd6\xf2\x51\x60\x9d\x14\xec\xf1\x8f\x9e\x1d\xdf\xe6\x9b\x94\x6e\x32\x04\x75\xf3\xd3\x0c\x64\x63\xb6\x46\xe8\xd3\xbf\x24\x55\x83\x03\x14\x61\x1c\xbd\xe4\x04\xbe\x51\x8b\x14\x46\x4f\xdb\x19\x5f\xdc\xc9\x2e\xb2\x22\xe6\x1f\x42\x6a\x4a\x59\x2c\x00\xa6\xa8\x97\x21",
-    },
-    TestVector {
-        sk: b"\x23\xd9\xf4\xea\x6d\x87\xb7\xd6\x16\x3d\x64\x25\x6e\x34\x49\x25\x5d\xb1\x47\x86\x40\x1a\x51\xda\xa7\x84\x71\x61\xbf\x56\xd4\x94\x32\x5a\xd2\xac\x8b\xa9\x28\x39\x4e\x01\x06\x1d\x88\x2c\x35\x28",
-        pk: b"\x5d\x42\xd6\x30\x1c\x54\xa4\x38\xf6\x59\x70\xba\xe2\xa0\x98\xcb\xc5\x67\xe9\x88\x40\x00\x6e\x35\x62\x21\x96\x6c\x86\xd8\x2e\x8e\xca\x51\x5b\xca\x85\x0e\xaa\x3c\xd4\x1f\x17\x5f\x03\xa0\xcb\xfd\x4a\xef\x5a\x0c\xee\xce\x95\xd3\x82\xbd\x70\xab\x5c\xe1\xcb\x77\x40\x8b\xae\x42\xb5\x1a\x08\x81\x6d\x5e\x5e\x1d\x3d\xa8\xc1\x8f\xcc\x95\x56\x4a\x75\x27\x30\xb0\xaa\xbe\xa9\x83\xcc\xea\x4e\x2e",
-        nonce: Some(b"\x67\xba\x37\x93\x66\x04\x90\x08\x59\x3e\xac\x12\x4f\x59\xab\x01\x73\x58\x89\x2e\xe0\xc0\x63\xd3\x8f\x37\x58\xbb\x84\x9f\xd2\x5d\x86\x7c\x35\x61\x56\x3c\xac\x15\x32\xa3\x23\xb2\x28\xdc\x08\x90"),
-        msg: b"\xd7\x68\xf4\x1e\x6e\x8e\xc2\x12\x5d\x6c\xf5\x78\x6d\x1b\xa9\x66\x68\xac\x65\x66\xc5\xcd\xbb\xe4\x07\xf7\xf2\x05\x1f\x3a\xd6\xb1\xac\xdb\xfe\x13\xed\xf0\xd0\xa8\x6f\xa1\x10\xf4\x05\x40\x6b\x69\x08\x52\x19\xb5\xa2\x34\xeb\xdb\x93\x15\x32\x41\xf7\x85\xd4\x58\x11\xb3\x54\x0d\x1c\x37\x42\x4c\xc7\x19\x44\x24\x78\x7a\x51\xb7\x96\x79\x26\x64\x84\xc7\x87\xfb\x1d\xed\x6d\x1a\x26\xb9\x56\x7d\x5e\xa6\x8f\x04\xbe\x41\x6c\xaf\x3b\xe9\xbd\x2c\xaf\xa2\x08\xfe\x2a\x9e\x23\x4d\x3a\xe5\x57\xc6\x5d\x3f\xe6\xda\x4c\xb4\x8d\xa4",
-        sig: b"\xfb\x31\x8f\x4c\xb1\x27\x62\x82\xbb\x43\xf7\x33\xa7\xfb\x7c\x56\x7c\xe9\x4f\x4d\x02\x92\x4f\xc7\x58\x63\x5a\xb2\xd1\x10\x71\x08\xbf\x15\x9b\x85\xdb\x08\x0c\xdc\x3b\x30\xfb\xb5\x40\x00\x16\xf3\x58\x8e\x3d\x7a\xf5\xda\x03\xea\xe2\x55\xec\xb1\x81\x31\x00\xd9\x5e\xdc\x24\x34\x76\xb7\x24\xb2\x2d\xb8\xe8\x53\x77\x66\x0d\x76\x45\xdd\xc1\xc2\xc2\xee\x4e\xae\xa8\xb6\x83\xdb\xe2\x2f\x86\xca",
-    },
-    TestVector {
-        sk: b"\xb5\xf6\x70\xe9\x8d\x8b\xef\xc4\x6f\x6f\x51\xfb\x29\x97\x06\x95\x50\xc2\xa5\x2e\xbf\xb4\xe5\xe2\x5d\xd9\x05\x35\x2d\x9e\xf8\x9e\xed\x5c\x2e\xcd\x16\x52\x18\x53\xaa\xdb\x1b\x52\xb8\xc4\x2a\xe6",
-        pk: b"\x44\xff\xb2\xa3\xa9\x5e\x12\xd8\x7c\x72\xb5\xea\x0a\x8a\x7c\xb8\x9f\x56\xb3\xbd\x46\x34\x2b\x23\x03\x60\x8d\x72\x16\x30\x1c\x21\xb5\xd2\x92\x1d\x80\xb6\x62\x8d\xc5\x12\xcc\xb8\x4e\x2f\xc2\x78\xe4\xc1\x00\x2f\x18\x28\xab\xae\xc7\x68\xca\xdc\xb7\xcf\x42\xfb\xf9\x3b\x17\x09\xcc\xae\x6d\xf5\xb1\x34\xc4\x1f\xae\x2b\x9a\x18\x8b\xfb\xe1\xec\xcf\xf0\xbd\x34\x85\x17\xd7\x22\x7f\x20\x71\xa6",
-        nonce: Some(b"\x22\x9e\x67\x63\x8f\x71\x2f\x57\xbe\xa4\xc2\xb0\x22\x79\xd5\xcc\xad\x1e\x7c\x9e\x20\x1c\x77\xf6\xf0\x1a\xeb\x81\xea\x90\xe6\x2b\x44\xb2\xd2\x10\x7f\xd6\x6d\x35\xe5\x66\x08\xff\xf6\x5e\x28\xe4"),
-        msg: b"\x6a\xf6\x65\x2e\x92\xa1\x7b\x78\x98\xe4\x0b\x67\x76\xfa\xba\xf0\xd7\x4c\xf8\x8d\x8f\x0e\xbf\xa6\x08\x83\x09\xcb\xe0\x9f\xac\x47\x2e\xea\xc2\xaa\x8e\xa9\x6b\x8c\x12\xe9\x93\xd1\x4c\x93\xf8\xef\x4e\x8b\x54\x7a\xfe\x7a\xe5\xe4\xf3\x97\x31\x70\xb3\x5d\xeb\x32\x39\x89\x89\x18\xc7\x0c\x10\x56\x33\x2c\x3f\x89\x4c\xd6\x43\xd2\xd9\xb9\x3c\x25\x61\xaa\xc0\x69\x57\x7b\xba\xb4\x58\x03\x25\x0a\x31\xcd\x62\x22\x6c\xab\x94\xd8\xcb\xa7\x26\x1d\xce\x9f\xe8\x8c\x21\x0c\x21\x2b\x54\x32\x9d\x76\xa2\x73\x52\x2c\x8b\xa9\x1d\xdf",
-        sig: b"\xb1\x1d\xb5\x92\xe4\xeb\xc7\x5b\x64\x72\xb8\x79\xb1\xd8\xce\x57\x45\x2c\x61\x5a\xef\x20\xf6\x7a\x28\x0f\x8b\xca\x9b\x11\xa3\x0a\xd4\xac\x9d\x69\x54\x12\x58\xc7\xdd\x5d\x0b\x4a\xb8\xdd\x7d\x49\x4e\xb5\x1d\xb8\x00\x4e\x46\xd4\x38\x35\x9a\xbf\x06\x0a\x94\x44\x61\x6c\xb4\x6b\x4f\x99\xc9\xa0\x5b\x53\xba\x6d\xf0\x2e\x91\x4c\x9c\x0b\x6c\xc3\xa9\x79\x1d\x80\x4d\x2e\x4c\x09\x84\xda\xb1\xcc",
-    },
-    TestVector {
-        sk: b"\xde\x59\x75\xd8\x93\x25\x33\xf0\x92\xe7\x62\x95\xed\x6b\x23\xf1\x0f\xc5\xfb\xa4\x8b\xfb\x82\xc6\xcc\x71\x48\x26\xba\xf0\x12\x68\x13\x24\x7f\x8b\xd5\x1d\x57\x38\x50\x36\x54\xab\x22\x45\x99\x76",
-        pk: b"\xf1\xfa\xba\xfc\x01\xfe\xc7\xe9\x6d\x98\x25\x28\xd9\xef\x3a\x2a\x18\xb7\xfe\x8a\xe0\xfa\x06\x73\x97\x73\x41\xc7\xae\x4a\xe8\xd8\xd3\xd6\x74\x20\x34\x3d\x01\x3a\x98\x4f\x5f\x61\xda\x29\xae\x38\x1a\x31\xcf\x90\x2c\x46\x34\x3d\x01\xb2\xeb\xb6\x14\xbc\x78\x9c\x31\x3b\x5f\x91\xf9\x30\x2a\xd9\x41\x8e\x9c\x79\x75\x63\xe2\xfa\x3d\x44\x50\x0f\x47\xb4\xe2\x6a\xd8\xfd\xec\x1a\x81\x6d\x1d\xcf",
-        nonce: Some(b"\xfc\x59\x40\xe6\x61\x54\x24\x36\xf9\x26\x5c\x34\xbc\xe4\x07\xef\xf6\x36\x4b\xd4\x71\xaa\x79\xb9\x0c\x90\x6d\x92\x3e\x15\xc9\xed\x96\xee\xa4\xe8\x6f\x32\x38\xea\x86\x16\x1d\x13\xb7\xd9\x35\x9d"),
-        msg: b"\xb9\x6d\x74\xb2\x26\x5d\xd8\x95\xd9\x4e\x25\x09\x2f\xb9\x26\x2d\xc4\xf2\xf7\xa3\x28\xa3\xc0\xc3\xda\x13\x4b\x2d\x0a\x4e\x20\x58\xca\x99\x4e\x34\x45\xc5\xff\x4f\x81\x27\x38\xe1\xb0\xc0\xf7\xa1\x26\x48\x69\x42\xa1\x2e\x67\x4a\x21\xf2\x2d\x08\x86\xd6\x8d\xf2\x37\x5f\x41\x68\x5d\x69\x4d\x48\x7a\x71\x80\x24\x93\x3a\x7c\x43\x06\xf3\x3f\x1a\x42\x67\xd4\x69\xc5\x30\xb0\xfe\xd4\xe7\xde\xa5\x20\xa1\x9d\xd6\x8b\xf0\x20\x3c\xc8\x7c\xad\x65\x22\x60\xed\x43\xb7\xb2\x3f\x6e\xd1\x40\xd3\x08\x58\x75\x19\x01\x91\xa0\x38\x1a",
-        sig: b"\xc2\xfb\xdd\x6a\x56\x78\x90\x24\x08\x21\x73\x72\x5d\x79\x7e\xf9\xfd\x6a\xcc\xb6\xae\x66\x4b\x72\x60\xf9\xe8\x3c\xb8\xab\x24\x90\x42\x8c\x8b\x9c\x52\xe1\x53\x61\x22\x95\x43\x2f\xec\x4d\x59\xcd\x80\x56\xc5\xbb\x57\xf4\x1f\x73\x08\x28\x88\xb2\x34\xfc\xda\x32\x0a\x33\x25\x0b\x5d\xa0\x12\xba\x1f\xdb\x49\x24\x35\x5a\xe6\x79\x01\x2d\x81\xd2\xc0\x8f\xc0\xf8\x63\x4c\x70\x8a\x48\x33\x23\x2f",
-    },
-    TestVector {
-        sk: b"\x11\xe0\xd4\x70\xdc\x31\xfa\xb0\xf5\x72\x2f\x87\xb7\x4a\x6c\x8d\x74\x14\x11\x5e\x58\xce\xb3\x8b\xfc\xdc\xed\x36\x7b\xea\xc3\xad\xbf\x1f\xe9\xba\x5a\x04\xf7\x2e\x97\x8b\x1e\xb5\x45\x97\xea\xbc",
-        pk: b"\x19\x50\x16\x69\x89\x16\x4c\xbf\xd9\x79\x68\xc7\xe8\xad\xb6\xfb\xca\x18\x73\xeb\xef\x81\x1e\xa2\x59\xeb\x48\xb7\xd5\x84\x62\x7f\x0e\x6d\x6c\x64\xde\xfe\x23\xcb\xc9\x52\x36\x50\x5a\x25\x2a\xa1\x41\xef\x42\x4b\x5c\xb0\x76\xd4\xe3\x2a\xcc\xd9\x25\x0e\xa7\x5f\xcf\x4f\xfd\x81\x81\x40\x40\xc0\x50\xd5\x8c\x0a\x29\xb0\x6b\xe1\x1e\xdf\x67\xc9\x11\xb4\x03\xe4\x18\xb7\x27\x74\x17\xe5\x29\x06",
-        nonce: Some(b"\xe5\x69\x04\x02\x82\x26\xeb\x04\xf8\xd0\x71\xe3\xf9\xce\xfe\xc9\x10\x75\xa8\x1c\xa0\xfa\x87\xb4\x4c\xae\x14\x8f\xe1\xce\x98\x27\xb5\xd1\x91\x0d\xb2\x33\x6d\x0e\xb9\x81\x3d\xdb\xa3\xe4\xd7\xb5"),
-        msg: b"\x7c\xec\x74\x80\xa0\x37\xff\x40\xc2\x32\xc1\xd2\xd6\xe8\xcd\x4c\x08\x0b\xbe\xec\xda\xf3\x88\x6f\xcc\xc9\xf1\x29\xbb\x6d\x20\x2c\x31\x6e\xca\x76\xc8\xad\x4e\x76\x07\x9a\xfe\x62\x2f\x83\x3a\x16\xf4\x90\x7e\x81\x72\x60\xc1\xfa\x68\xb1\x0c\x7a\x15\x1a\x37\xeb\x8c\x03\x6b\x05\x7e\xd4\x65\x2c\x35\x3d\xb4\xb4\xa3\x4b\x37\xc9\xa2\xb3\x00\xfb\x5f\x5f\xcf\xb8\xaa\x8a\xda\xe1\x3d\xb3\x59\x16\x0f\x70\xa9\x24\x15\x46\x14\x0e\x55\x0a\xf0\x07\x34\x68\x68\x33\x77\xe6\x77\x1b\x65\x08\x32\x74\x08\xc2\x45\xd7\x89\x11\xc2\xcc",
-        sig: b"\xc3\x8e\xf3\x0f\x55\x62\x4e\x89\x35\x68\x0c\x29\xf8\xc2\x48\x24\x87\x7c\xf4\x8f\xfc\x0e\xf0\x15\xe6\x2d\xe1\x06\x88\x93\x35\x30\x30\xd1\x19\x3b\xf9\xd3\x42\x37\xd7\xce\x6b\xa9\x2c\x98\xb0\xfe\x65\x1b\x8c\x3d\x5c\x9d\x5b\x93\x6d\x30\x08\x02\xa0\x6d\x82\xad\x54\xf7\xb1\xba\x43\x27\xb2\xf0\x31\xc0\xc5\xb0\xcb\x21\x5a\xd4\x35\x4e\xdc\x7f\x93\x2d\x93\x4e\x87\x7d\xfa\x1c\xf5\x1b\x13\xfe",
-    },
-    TestVector {
-        sk: b"\x5c\x6b\xbf\x9f\xbc\xbb\x7b\x97\xc9\x53\x5f\x57\xb4\x31\xed\x1c\xca\xe1\x94\x5b\x7e\x8a\x4f\x1b\x03\x20\x16\xb0\x78\x10\xbd\x24\xa9\xe2\x00\x55\xc0\xe9\x30\x66\x50\xdf\x59\xef\x7e\x2c\xd8\xc2",
-        pk: b"\x2e\x01\xc5\xb5\x9e\x61\x9e\x00\xb7\x90\x60\xa1\xe8\xef\x69\x54\x72\xe2\x3b\xf9\xa5\x11\xfc\x3d\x5e\xd7\x7a\x33\x4a\x24\x25\x57\x09\x8e\x40\x97\x27\x13\x73\x2c\x52\x91\xc9\x7a\xdf\x9c\xf2\xcf\x56\x3e\x3f\xe4\xad\x80\x7e\x80\x3b\x9e\x96\x1b\x08\xda\x4d\xde\x4c\xea\x89\x25\x64\x9d\xa0\xd9\x32\x21\xce\x4c\xdc\xea\xbc\x6a\x1d\xb7\x61\x21\x80\xa8\xc6\xbe\xf3\x57\x9c\x65\x53\x9b\x97\xe9",
-        nonce: Some(b"\x03\xd2\x3f\x12\x77\xb9\x49\xcb\x63\x80\x21\x1a\xd9\xd3\x38\xe6\xf7\x6c\x3e\xed\xac\x95\x98\x9b\x91\xd0\x24\x3c\xfb\x73\x4a\x54\xb1\x9b\xca\x45\xa5\xd1\x3d\x6a\x4b\x9f\x81\x5d\x91\x9e\xea\x77"),
-        msg: b"\x00\xce\x97\x86\x03\x22\x97\x10\x34\x5c\x9a\xd7\xc1\xc2\xdb\xa3\x59\x6b\x19\x65\x28\xee\xa2\x5b\xd8\x22\xd4\x3c\xa8\xf7\x6a\x02\x4e\x29\x21\x77\x03\xdd\x06\x52\xc8\xa6\x15\x28\x4f\xc3\xed\xcc\x1c\x5a\xd1\xc8\xd5\xa8\x52\x1c\x8e\x10\x4c\x01\x6a\x24\xe5\x0c\x2e\x25\x06\x6d\xcb\x56\x59\x6f\x91\x3b\x87\x27\x67\xe3\x62\x7a\xa3\xe5\x5e\xc8\x12\xe9\xfd\xac\x7c\x2f\x1b\xea\xde\x83\xae\xf0\x93\xe2\x4c\x9c\x95\x39\x82\xad\xf4\x31\xa7\x76\x88\x0a\xe4\x58\x3b\xe1\x58\xe1\x1c\xda\xb1\xcb\xca\x3a\xd3\xa6\x69\x00\x21\x3d",
-        sig: b"\xab\xab\x65\x30\x8f\x0b\x79\xc4\xf3\xa9\xff\x28\xdd\x49\x0a\xcb\x0c\x32\x04\x34\x09\x4c\xef\x93\xe7\x5a\xdf\xe1\x7e\x58\x20\xdc\x1f\x77\x54\x4c\xfa\xaa\xcd\xc8\xcf\x9a\xc8\xb3\x8e\x17\x4b\xef\x11\xb7\x83\xd8\x79\xa6\xde\x05\x4b\x31\x6a\xf7\xd5\x6e\x52\x6c\x3d\xce\x96\xc8\x52\x89\x12\x2e\x3a\xd9\x27\xcf\xa7\x7b\xfc\x50\xb4\xa9\x6c\x97\xf8\x5b\x1b\x82\x21\xbe\x2d\xf0\x83\xff\x58\xfb",
-    },
-    TestVector {
-        sk: b"\xff\xc7\xde\xde\xff\x83\x43\x72\x1f\x72\x04\x6b\xc3\xc1\x26\x62\x6c\x17\x7b\x0e\x48\xe2\x47\xf4\x4f\xd6\x1f\x84\x69\xd4\xd5\xf0\xa7\x41\x47\xfa\xba\xa3\x34\x49\x5c\xc1\xf9\x86\xeb\xc5\xf0\xb1",
-        pk: b"\x51\xc7\x8c\x97\x94\x52\xed\xd5\x3b\x56\x3f\x63\xeb\x3e\x85\x4a\x5b\x23\xe8\x7f\x1b\x21\x03\x94\x2b\x65\xf7\x7d\x02\x44\x71\xf7\x5c\x8c\xe1\xcc\x0d\xfe\xf8\x32\x92\xb3\x68\x11\x2a\xa5\x12\x6e\x31\x3e\x6a\xaf\x09\xca\xa3\xba\x30\xf1\x30\x72\xb2\x13\x48\x78\xf1\x4a\x4a\x01\xee\x86\x32\x6c\xcc\xbf\xf3\xd0\x79\xb4\xdf\x09\x7d\xc5\x79\x85\xe8\xc8\xc8\x34\xa1\x0c\xb9\xd7\x66\x16\x93\x66",
-        nonce: Some(b"\xc3\xde\x91\xdb\xe4\xf7\x77\x69\x87\x73\xda\x70\xdd\x61\x0e\xf1\xa7\xef\xe4\xdc\x00\xd7\x34\x39\x9c\x7d\xd1\x00\x72\x80\x06\xa5\x02\x82\x2a\x5a\x7f\xf9\x12\x9f\xfd\x8a\xdf\x6c\x1f\xc1\x21\x1a"),
-        msg: b"\x54\xa2\x55\xc1\x86\x92\xc6\x16\x2a\x46\xad\xd1\x76\xa0\xae\x83\x61\xdc\xb8\x94\x8f\x09\x2d\x8d\x7b\xac\x83\xe1\x60\x43\x17\x94\xd3\xb9\x81\x28\x49\xbf\x19\x94\xbc\xdc\xfb\xa5\x6e\x85\x40\xc8\xa9\xee\x5b\x93\x41\x45\x48\xf2\xa6\x53\x19\x1b\x6b\xb2\x8b\xda\x8d\xc7\x0d\x45\xcc\x1b\x92\xa4\x89\xf5\x8a\x2d\x54\xf8\x57\x66\xcb\x3c\x90\xde\x7d\xd8\x8e\x69\x0d\x8e\xbc\x9a\x79\x98\x7e\xee\x19\x89\xdf\x35\xaf\x5e\x35\x52\x2f\x83\xd8\x5c\x48\xdd\xa8\x98\x63\x17\x1c\x8b\x0b\xf4\x85\x3a\xe2\x8c\x2a\xc4\x5c\x76\x44\x16",
-        sig: b"\xf4\xf4\x77\x85\x58\x19\xad\x8b\x17\x63\xf5\x36\x91\xb7\x6a\xfb\xc4\xa3\x1a\x63\x8b\x1e\x08\xc2\x93\xf9\xbc\xd5\x5d\xec\xf7\x97\xf9\x91\x3c\xa1\x28\xd4\xb4\x5b\x2e\x2e\xa3\xe8\x2c\x6c\xf5\x65\x7c\x26\xbe\x29\x56\x9e\xf9\x54\x80\xa6\xd0\xc1\xaf\x49\xdc\x10\xa5\x1a\x0a\x89\x31\x34\x5e\x48\xc0\xc3\x94\x98\xbf\xb9\x4d\x62\x96\x29\x80\xb5\x61\x43\xa7\xb4\x1a\x2f\xdd\xc8\x79\x4c\x1b\x7f",
-    },
-    TestVector {
-        sk: b"\xad\xca\x36\x4e\xf1\x44\xa2\x1d\xf6\x4b\x16\x36\x15\xe8\x34\x9c\xf7\x4e\xe9\xdb\xf7\x28\x10\x42\x15\xc5\x32\x07\x3a\x7f\x74\xe2\xf6\x73\x85\x77\x9f\x7f\x74\xab\x34\x4c\xc3\xc7\xda\x06\x1c\xf6",
-        pk: b"\xef\x94\x8d\xaa\xe6\x82\x42\x33\x0a\x73\x58\xef\x73\xf2\x3b\x56\xc0\x7e\x37\x12\x62\x66\xdb\x3f\xa6\xee\xa2\x33\xa0\x4a\x9b\x3e\x49\x15\x23\x3d\xd6\x75\x44\x27\xcd\x4b\x71\xb7\x58\x54\x07\x7d\x00\x94\x53\xef\x18\x28\xea\xff\x9e\x17\xc8\x56\xd4\xfc\x18\x95\xab\x60\x05\x13\x12\xc3\xe1\xdb\x1e\x37\x66\x56\x64\x38\xb2\x99\x0c\xbf\x99\x45\xc2\x54\x56\x19\xe3\xe0\x14\x5b\xc6\xa7\x90\x04",
-        nonce: Some(b"\xa2\xda\x3f\xae\x2e\x6d\xa3\xcf\x11\xb4\x98\x61\xaf\xb3\x4f\xba\x35\x7f\xea\x89\xf5\x4b\x35\xce\x5e\xd7\x43\x4a\xe0\x91\x03\xfe\x53\xe2\xbe\x75\xb9\x3f\xc5\x79\xfe\xdf\x91\x9f\x6d\x5e\x40\x7e"),
-        msg: b"\x69\x2a\x78\xf9\x0d\x4f\x9d\x5a\xee\x5d\xa5\x36\x31\x4a\x78\xd6\x8c\x1f\xea\xbb\xfe\x5d\x1c\xce\xa7\xf6\x05\x9a\x66\xc4\xb3\x10\xf8\x05\x1c\x41\x1c\x40\x9c\xcf\x6e\x19\xa0\xcb\xd8\xb8\xe1\x00\xc4\x83\x17\xfe\x8c\x6d\x4f\x8a\x63\x8b\x95\x51\xce\x7e\xe1\x78\x02\x0f\x04\xf7\xda\x30\x01\xa0\xe6\x85\x52\x25\xfb\x3c\x9b\x37\x5e\x4e\xd9\x64\x58\x8a\x1a\x41\xa0\x95\xf3\xf4\x76\xc4\x2d\x52\xff\xd2\x3c\xe1\x70\x2c\x93\xb5\x6d\x44\x25\xd3\xbe\xfc\xf7\x5d\x09\x51\xb6\xfd\x5c\x05\xb0\x54\x55\xbd\xaf\x20\x5f\xe7\x0c\xa2",
-        sig: b"\xdd\xa9\x94\xb9\xc4\x28\xb5\x7e\x9f\x8b\xba\xeb\xba\x0d\x68\x2e\x3a\xac\x6e\xd8\x28\xe3\xa1\xe9\x9a\x7f\xc4\xc8\x04\xbf\xf8\xdf\x15\x11\x37\xf5\x39\xc7\x38\x9d\x80\xe2\x3d\x9f\x3e\xe4\x97\xbf\xa0\xd6\xb1\x0c\xef\xfd\x0e\x1b\x29\xcf\x78\x44\x76\xf9\x17\x3b\xa6\xec\xd2\xcf\xc7\x92\x97\x25\xf2\xd6\xe2\x4e\x0d\xb5\xa4\x72\x16\x83\x64\x0e\xaa\x2b\xbe\x15\x1f\xb5\x75\x60\xf9\xce\x59\x4b",
-    },
-    TestVector {
-        sk: b"\x39\xbe\xa0\x08\xec\x8a\x21\x78\x66\xdc\xbd\xb1\xb9\x3d\xa3\x4d\x1d\x3e\x85\x1d\x01\x1d\xf9\xef\x44\xb7\x82\x8b\x34\x53\xa5\x4a\xa7\x0f\x1d\xf9\x93\x21\x70\x80\x4e\xac\xd2\x07\xe4\xf7\xe9\x1d",
-        pk: b"\x57\x09\xec\x43\x05\xa9\xc3\x27\x1c\x30\x4f\xac\xe6\xc1\x48\x14\x24\x90\xb8\x27\xa7\x3a\x4c\x17\xaf\xfc\xfd\x01\xff\xfd\x7e\xaa\x65\xd2\xfd\xed\xfa\x24\x19\xfc\x64\xed\x91\x08\x23\x51\x3f\xaf\xb0\x83\xcd\xa1\xcf\x3b\xe6\x37\x1b\x6c\x06\xe7\x29\xea\x62\x99\x21\x34\x28\xdb\x57\x11\x93\x47\x24\x7e\xc1\xfc\xd4\x42\x04\x38\x6c\xc0\xbc\xa3\xf4\x52\xd9\xd8\x64\xb3\x9e\xfb\xfc\x89\xd6\xb2",
-        nonce: Some(b"\x3c\x90\xcc\x7b\x69\x84\x05\x6f\x57\x05\x42\xa5\x1c\xbe\x49\x7c\xe4\xc1\x1a\xea\xe8\xfc\x35\xe8\xfd\x6a\x0d\x9a\xde\xb6\x50\xe8\x64\x4f\x9d\x1d\x5e\x43\x41\xb5\xad\xc8\x1e\x27\xf2\x84\xc0\x8f"),
-        msg: b"\x3b\x30\x9b\xb9\x12\xab\x2a\x51\x68\x14\x51\xed\x18\xad\x79\xe9\x5d\x96\x8a\xbc\x35\x42\x3a\x67\x03\x6a\x02\xaf\x92\xf5\x75\xa0\xc8\x9f\x1b\x66\x8a\xfe\x22\xc7\x03\x7a\xd1\x19\x9e\x75\x7a\x8f\x06\xb2\x81\xc3\x3e\x9a\x40\xba\xb6\x9c\x98\x74\xe0\xbb\x68\x0b\x90\x5d\x90\x9b\x9d\xc2\x4a\x9f\xe8\x9b\xb3\xd7\xf7\xd4\x70\x82\xb2\x50\x93\xc5\x97\x54\xf8\xc1\x9d\x1f\x81\xf3\x03\x34\xa8\xcd\xd5\x0a\x3c\xb7\x2f\x96\xd4\xb3\xc3\x05\xe6\x0a\x43\x9a\x7e\x93\xae\xb6\x40\xdd\x3c\x8d\xe3\x7d\x63\xc6\x0f\xb4\x69\xc2\xd3\xed",
-        sig: b"\xd1\x36\x46\x89\x5a\xfb\x1b\xfd\x19\x53\x55\x1b\xb9\x22\x80\x9c\x95\xad\x65\xd6\xab\xe9\x4e\xb3\x71\x9c\x89\x9a\xa1\xf6\xdb\xa6\xb0\x12\x22\xc7\xf2\x83\x90\x0f\xe9\x86\x28\xb7\x59\x7b\x6e\xa6\x4a\x9a\x38\xaf\xda\x04\xc0\xa6\xb0\x05\x89\x43\xb6\x79\xbd\x02\x20\x5b\x14\xd0\xf3\xd4\x9b\x8f\x31\xaa\xc2\x89\x12\x97\x80\xcd\xb1\xc5\x55\xde\xf8\xc3\xf9\x10\x6b\x47\x87\x29\xe0\xc7\xef\xaa",
-    },
-    TestVector {
-        sk: b"\xe8\x49\xcf\x94\x8b\x24\x13\x62\xe3\xe2\x0c\x45\x8b\x52\xdf\x04\x4f\x2a\x72\xde\xb0\xf4\x1c\x1b\xb0\x67\x3e\x7c\x04\xcd\xd7\x08\x11\x21\x50\x59\x03\x2b\x5c\xa3\xcc\x69\xc3\x45\xdc\xce\x4c\xf7",
-        pk: b"\x06\xc0\x37\xa0\xcb\xf4\x3f\xdf\x33\x5d\xff\x33\xde\x06\xd3\x43\x48\x40\x53\x53\xf9\xfd\xf2\xce\x13\x61\xef\xba\x30\xfb\x20\x4a\xea\x9d\xbd\x2e\x30\xda\x0a\x10\xfd\x2d\x87\x61\x88\x37\x1b\xe6\x36\x0d\x38\xf3\x94\x0e\x34\x67\x92\x04\xb9\x8f\xbf\x70\xb8\xa4\xd9\x7f\x25\x44\x3e\x46\xd0\x80\x7a\xb6\x34\xed\x58\x91\xad\x86\x4d\xd7\x70\x35\x57\xaa\x93\x3c\xd3\x80\xe2\x6e\xea\x66\x2a\x43",
-        nonce: Some(b"\x32\x38\x6b\x25\x93\xc8\x5e\x87\x7b\x70\xe5\xe5\x49\x59\x36\xf6\x5d\xc4\x95\x53\xca\xef\x1a\xa6\xcc\x14\xd9\xcd\x37\x0c\x44\x2a\x0c\xcf\xab\x4c\x0d\xa9\xec\x31\x1b\x67\x91\x3b\x1b\x57\x5a\x9d"),
-        msg: b"\xf0\x72\xb7\x2b\x87\x83\x28\x94\x63\xda\x11\x86\x13\xc4\x38\x24\xd1\x14\x41\xdb\xa3\x64\xc2\x89\xde\x03\xff\x5f\xab\x3a\x6f\x60\xe8\x59\x57\xd8\xff\x21\x1f\x1c\xb6\x2f\xa9\x02\x16\xfb\x72\x71\x06\xf6\x92\xe5\xae\x08\x44\xb1\x1b\x71\x0e\x5a\x12\xc6\x9d\xf3\xed\x89\x5b\x94\xe8\x76\x9e\xcd\x15\xff\x43\x37\x62\xd6\xe8\xe9\x4d\x8e\x6a\x72\x64\x5b\x21\x3b\x02\x31\x34\x4e\x2c\x96\x80\x56\x76\x6c\x5d\xd6\xb5\xa5\xdf\x41\x97\x18\x58\xb8\x5e\x99\xaf\xbf\x85\x94\x00\xf8\x39\xb4\x2c\xd1\x29\x06\x8e\xfa\xbe\xea\x4a\x26",
-        sig: b"\x58\x86\x07\x8d\x34\x95\x76\x7e\x33\x0c\x75\x07\xb7\xca\x0f\xa0\x7a\x50\xe5\x99\x12\xa4\x16\xd8\x9f\x0a\xb1\xaa\x4e\x88\x15\x3d\x6e\xaf\x00\x88\x2d\x1b\x4a\xa6\x41\x53\x15\x33\x52\xd8\x53\xb5\x2c\xc1\x00\x23\xbf\x1b\xf8\xcc\xfd\x14\xb0\x6b\x82\xcc\x21\x14\x44\x9a\x35\x23\x89\xc8\xff\x9f\x6f\x78\xcd\xc4\xe3\x2b\xde\x69\xf3\x86\x9d\xa0\xe1\x7f\x69\x1b\x32\x96\x82\xae\x7a\x36\xe1\xaa",
-    },
-    TestVector {
-        sk: b"\xd8\x96\x07\x47\x5d\x50\x9e\xf2\x3d\xc9\xf4\x76\xea\xe4\x28\x0c\x98\x6d\xe7\x41\xb6\x35\x60\x67\x0f\xa2\xbd\x60\x5f\x50\x49\xf1\x97\x27\x92\xc0\x41\x3a\x5b\x3b\x4b\x34\xe7\xa3\x8b\x70\xb7\xca",
-        pk: b"\x49\xa1\xc6\x31\xf3\x1c\xf5\xc4\x5b\x26\x76\xb1\xf1\x30\xcb\xf9\xbe\x68\x3d\x0a\x50\xdf\xfa\xe0\xd1\x47\xc1\xe9\x91\x3a\xb1\x09\x0c\x65\x29\xa8\x4f\x47\xdd\xc7\xcf\x02\x59\x21\xb7\x71\x35\x5a\x1e\x20\x7e\xec\xe6\x2f\x2b\xcc\x6b\xda\xbc\x11\x13\x15\x81\x45\x17\x0b\xe9\x74\x69\xa2\x90\x4e\xaa\xa9\x3a\xad\x85\xb8\x6a\x19\x71\x92\x07\xf3\xe4\x23\x05\x1f\x5b\x9c\xbb\xe2\x75\x4e\xef\xcb",
-        nonce: Some(b"\x78\x61\x3c\x57\x0c\x8d\x33\xb7\xdd\x1b\xd1\x56\x1d\x87\xe3\x62\x82\xe8\xcf\x48\x43\xe7\xc3\x44\xa2\xb2\xbb\x6a\x0d\xa9\x47\x56\xd6\x70\xee\xaf\xfe\x43\x4f\x7a\xe7\xc7\x80\xf7\xcf\x05\xca\x08"),
-        msg: b"\xcf\x49\x45\x35\x0b\xe8\x13\x3b\x57\x5c\x4a\xd6\xc9\x58\x5e\x0b\x83\xff\x1e\xd1\x79\x89\xb6\xcd\x6c\x71\xb4\x1b\x52\x64\xe8\x28\xb4\xe1\x15\x99\x5b\x1a\xe7\x75\x28\xe7\xe9\x00\x2a\xc1\xb5\x66\x90\x64\x44\x26\x45\x92\x9f\x9d\x7d\xd7\x09\x27\xcb\x93\xf9\x5e\xde\xb7\x3e\x86\x24\xf4\xbc\x89\x7e\xc4\xc2\xc7\x58\x1c\xb6\x26\x91\x6f\x29\xb2\xd6\xe6\xc2\xfb\xa8\xc5\x9a\x71\xe3\x07\x54\xb4\x59\xd8\x1b\x91\x2a\x12\x79\x81\x82\xbc\xff\x40\x19\xc7\xbd\xfe\x92\x9c\xc7\x69\xbc\xc2\x41\x4b\xef\xe7\xd2\x90\x6a\xdd\x42\x71",
-        sig: b"\x66\xf9\x2b\x39\xaa\x3f\x4a\xeb\x9e\x2d\xc0\x3a\xc3\x85\x54\x06\xfa\x3e\xbb\xab\x0a\x6c\x88\xa7\x8d\x7a\x03\x48\x2f\x0c\x98\x68\xd7\xb7\x8b\xc0\x81\xed\xe0\x94\x7c\x7f\x37\xbf\x19\x30\x74\xba\xe5\xc6\x4e\xd9\x8d\x7f\x37\x01\x19\x3f\x25\xdd\x23\x7d\x59\xc9\x1c\x0d\xa6\xe2\x62\x15\xe0\x88\x9d\x82\xe6\xd3\xe4\x16\x69\x3f\x8d\x58\x84\x3c\xf3\x0a\xb1\x0a\xb8\xd0\xed\xd9\x17\x0b\x53\xad",
-    },
-    TestVector {
-        sk: b"\x08\x3e\x71\x52\x73\x4a\xdf\x34\x25\x20\xae\x37\x70\x87\xa2\x23\x68\x8d\xe2\x89\x9b\x10\xcf\xcb\x34\xa0\xb3\x6b\xca\x50\x0a\x4d\xfa\x53\x0e\x23\x43\xe6\xa3\x9d\xa7\xae\x1e\xb0\x86\x2b\x4a\x0d",
-        pk: b"\x70\xa0\xf1\x6b\x6c\x61\x17\x26\x59\xb0\x27\xed\x19\xb1\x8f\xd8\xf5\x7b\xd2\x8d\xc0\x50\x1f\x20\x7b\xd6\xb0\xbb\x06\x5b\x56\x71\xcf\x3d\xd1\xed\x13\xd3\x88\xdc\xf6\xcc\xc7\x66\x59\x7a\xa6\x04\x4f\x84\x5b\xf0\x1c\x3c\x3f\x61\x26\xa7\x36\x8c\x34\x54\xf5\x14\x25\x80\x1e\xe0\xb7\x2e\x63\xfb\x67\x99\xb4\x42\x0b\xfd\xeb\xe3\xe3\x7c\x72\x46\xdb\x62\x7c\xc8\x2c\x09\x65\x49\x79\xc7\x00\xbb",
-        nonce: Some(b"\x28\x09\x6a\xba\xbe\x29\xa0\x75\xfb\xdf\x89\x47\x09\xa2\x0d\x0f\xde\xdb\x01\xed\x3e\xea\xcb\x64\x2a\x33\xa0\xda\x6a\xed\x72\x6e\x13\xca\xf6\xcf\x20\x67\x92\xec\x35\x9f\x0c\x9f\x9b\x56\x75\x52"),
-        msg: b"\xd9\xb5\xcf\x0b\x50\x41\x65\x73\xff\x3c\x63\x13\x32\x75\xa1\x83\x94\xdd\x43\x26\xbe\x20\x41\xe8\xd9\x7e\x6e\x4e\x38\x55\xa4\xa1\x77\xe9\xd2\x6d\xfd\x22\x3f\xe8\xaa\x74\x56\x4e\xdb\x49\xbd\x72\xde\x19\x91\x6f\xb6\xf0\x01\xf4\x45\x30\xd5\xc1\x8e\x2c\x33\x2b\xce\x1b\x74\x15\xdf\x59\x27\xec\xe5\xf3\x82\x4f\x34\xd1\x74\xb9\x63\x13\x6b\x53\xae\xf1\xfb\x78\xfb\x0c\x06\xa2\x01\xa4\x0b\x2d\xb3\x8e\x4d\x82\x16\xfc\x1e\x39\x2a\x79\x8c\x8a\xb4\xb3\xa3\x14\x49\x6b\x7f\x10\x87\x80\x4e\xbf\xa8\x9b\xf9\x6e\x9c\xdb\x80\xc0",
-        sig: b"\xee\x29\x23\xf9\xb9\x99\x9e\xa0\x5b\x5e\x57\xf5\x05\xbe\xd5\xc6\xba\x04\x20\xde\xf4\x2c\x6f\xa9\x0e\xef\x7a\x6e\xf7\x70\x78\x65\x25\x54\x6d\xe2\x7c\xde\xb2\xf8\x58\x6f\x8f\x29\xfb\x4e\xe6\x7c\x50\xef\x92\x3f\xb2\x17\xc4\xcf\x65\xa4\x8b\x94\x41\x2f\xda\x43\x0f\xac\x68\x5f\x0d\xa7\xbd\x57\x45\x57\xc6\xc5\x0f\x5b\x22\xe0\xc8\x35\x4d\x99\xf2\xc2\xf2\xc2\x69\x1f\x25\x2f\x93\xc7\xd8\x4a",
-    },
-    TestVector {
-        sk: b"\x63\x57\x8d\x41\x62\x15\xaf\xf2\xcc\x78\xf9\xb9\x26\xd4\xc7\x74\x0a\x77\xc1\x42\x94\x4e\x10\x4a\xa7\x42\x2b\x19\xa6\x16\x89\x82\x62\xd4\x6a\x8a\x94\x2d\x5e\x8d\x5d\xb1\x35\xee\x8b\x09\xa3\x68",
-        pk: b"\xca\xdb\xac\xef\x44\x06\x09\x93\x16\xdb\x2c\xe3\x20\x6a\xdc\x63\x6c\x2b\xb0\xa8\x35\x84\x7e\xd7\x94\x1e\xfb\x02\x86\x24\x72\xf3\x15\x03\x38\xf1\x3f\x48\x60\xd4\x7f\x39\xb7\xe0\x98\xf0\xa3\x90\x75\x2a\xd0\xf2\x2c\x9c\x26\x43\x36\xcd\xe1\x1b\xbc\x95\xd1\x81\x6e\xd4\xd1\xb1\x50\x0d\xb6\xb8\xdc\xe2\x59\xa4\x28\x32\xe6\x13\xc3\x11\x78\xc2\xc7\x99\x52\x06\xa6\x2e\x20\x1b\xa1\x08\xf5\x70",
-        nonce: Some(b"\x7b\x69\xc5\xd5\xb4\xd0\x5c\x99\x50\xdc\x94\xc2\x7d\x58\x40\x3b\x4c\x52\xc0\x04\xb8\x0a\x80\x41\x8a\xd3\xa8\x9a\xab\xc5\xd3\x4f\x21\x92\x67\x29\xe7\x6a\xfd\x28\x0c\xc8\xee\x88\xc9\x80\x5a\x2a"),
-        msg: b"\x9e\x40\x42\xd8\x43\x8a\x40\x54\x75\xb7\xda\xb1\xcd\x78\x3e\xb6\xce\x1d\x1b\xff\xa4\x6a\xc9\xdf\xda\x62\x2b\x23\xac\x31\x05\x7b\x92\x2e\xce\xd8\xe2\xed\x7b\x32\x41\xef\xea\xfd\x7c\x9a\xb3\x72\xbf\x16\x23\x0f\x71\x34\x64\x7f\x29\x56\xfb\x79\x39\x89\xd3\xc8\x85\xa5\xae\x06\x4e\x85\xed\x97\x1b\x64\xf5\xf5\x61\xe7\xdd\xb7\x9d\x49\xaa\x6e\xbe\x72\x7c\x67\x1c\x67\x87\x9b\x79\x45\x54\xc0\x4d\xe0\xe0\x5d\x68\x26\x48\x55\x74\x5e\xf3\xc9\x56\x7b\xd6\x46\xd5\xc5\xf8\x72\x8b\x79\x7c\x18\x1b\x6b\x6a\x87\x6e\x16\x76\x63",
-        sig: b"\xdb\x05\x4a\xdd\xb6\x16\x1e\xe4\x9c\x6c\xe2\xe4\xd6\x46\xd7\x67\x07\x54\x74\x7b\x67\x37\xca\x85\x16\xe9\xd1\xe8\x78\x59\x93\x7c\x3e\xf9\xb1\xd2\x66\x3e\x10\xd7\xe4\xbd\x00\xec\x85\xb7\xa9\x7a\xfc\xc5\x04\xe0\xf0\x0e\xf2\x95\x87\xe4\xbc\x22\xfa\xad\xa4\xdb\x30\xe2\xcb\x1a\xc5\x52\x68\x0a\x65\x78\x5a\xe8\x7b\xeb\x66\x6c\x79\x25\x13\xf2\xbe\x7a\x31\x80\xfc\x54\x42\x96\x84\x1a\x0e\x27",
-    },
-    TestVector {
-        sk: b"\xed\x4d\xf1\x99\x71\x65\x8b\x74\x86\x88\x00\xb3\xb8\x1b\xc8\x77\x80\x77\x43\xb2\x5c\x65\x74\x0f\x1d\x63\x77\x54\x2a\xfe\x2c\x64\x27\x61\x2c\x84\x0a\xda\x31\xa8\xeb\x79\x47\x18\xf3\x7c\x72\x83",
-        pk: b"\x33\x09\x3a\x05\x68\x75\x7e\x8b\x58\xdf\x5b\x72\xea\x5f\xe5\xbf\x26\xe6\xf7\xae\xb5\x41\xb4\xc6\xa8\xc1\x89\xc9\x37\x21\x74\x9b\xca\xce\xcc\xf2\x98\x2a\x2f\x07\x02\x58\x6a\x9f\x81\x2f\xc6\x6f\xeb\xe3\x20\xd0\x9e\x1f\x06\x62\x18\x9d\x50\xb8\x5a\x20\x40\x3b\x82\x1a\xc0\xd0\x00\xaf\xdb\xf6\x6a\x0a\x33\xf3\x04\x72\x6c\x69\xe3\x54\xd8\x1c\x50\xb9\x4b\xa3\xa5\x25\x0e\xfc\x31\x31\x9c\xd1",
-        nonce: Some(b"\xd9\xb4\xcd\x1b\xdf\xa8\x3e\x60\x82\x89\x63\x4d\xbf\xce\xe6\x43\xf0\x73\x15\xba\xf7\x43\xfc\x91\x92\x28\x80\xb5\x5a\x2f\xed\xa3\xb3\x8d\xdf\x60\x40\xd3\xba\x10\x98\x5c\xd1\x28\x5f\xc6\x90\xd5"),
-        msg: b"\x0b\x14\xa7\x48\x4a\x40\xb6\x8a\x3c\xe1\x27\x3b\x8a\x48\xb8\xfd\xb6\x5b\xa9\x00\xd9\x85\x41\xc4\xbb\xd0\x7b\x97\xe3\x1b\xcc\x4c\x85\x54\x5a\x03\xe9\xde\xab\x3c\x56\x3f\x47\xa0\x36\xff\x60\xd0\x36\x16\x84\xba\x24\x1b\x5a\xa6\x8b\xb4\x6f\x44\x0d\xa2\x21\x81\xee\x32\x8a\x01\x1d\xe9\x8e\xff\x34\xba\x23\x5e\xc1\x06\x12\xb0\x7b\xdf\xa6\xb3\xdc\x4c\xcc\x5e\x82\xd3\xa8\xd0\x57\xe1\x86\x2f\xef\x3d\xef\x5a\x18\x04\x69\x6f\x84\x69\x9f\xda\x2e\xc4\x17\x5a\x54\xa4\xd0\x8b\xcb\x4f\x04\x06\xfd\xac\x4e\xdd\xad\xf5\xe2\x9b",
-        sig: b"\x00\x9c\x74\x06\x3e\x20\x6a\x42\x59\xb5\x3d\xec\xff\x54\x45\x68\x3a\x03\xf4\x4f\xa6\x72\x52\xb7\x6b\xd3\x58\x10\x81\xc7\x14\xf8\x82\xf8\x82\xdf\x91\x5e\x97\xdb\xea\xb0\x61\xfa\x8b\x3c\xc4\xe7\xd4\x0e\x09\xd3\x46\x8b\x46\x69\x99\x48\x00\x7e\x8f\x59\x84\x57\x66\xdb\xf6\x94\xb9\xc6\x20\x66\x89\x0d\xd0\x55\xc0\xcb\x9a\x0c\xaf\x0a\xa6\x11\xfb\x9f\x46\x6a\xd0\xbb\xb0\x0d\xbe\x29\xd7\xeb",
-    },
-    TestVector {
-        sk: b"\xe9\xc7\xe9\xa7\x96\x18\xd6\xff\x32\x74\xda\x1a\xbd\x0f\xf3\xed\x0e\xc1\xae\x3b\x54\xc3\xa4\xfd\x8d\x68\xd9\x8f\xb0\x43\x26\xb7\x63\x3f\xc6\x37\xe0\xb1\x95\x22\x8d\x0e\xdb\xa6\xbb\x14\x68\xfb",
-        pk: b"\xa3\x9a\xc3\x53\xca\x78\x79\x82\xc5\x77\xaf\xf1\xe8\x60\x1c\xe1\x92\xaa\x90\xfd\x0d\xe4\xc0\xed\x62\x7f\x66\xa8\xb6\xf0\x2a\xe5\x13\x15\x54\x3f\x72\xff\xc1\xc4\x8a\x72\x69\xb2\x5e\x7c\x28\x9a\x90\x64\xa5\x07\xb6\x6b\x34\x0b\x6e\x0e\x0d\x5f\xfa\xa6\x7d\xd2\x0e\x6d\xaf\xc0\xea\x6a\x6f\xae\xe1\x63\x51\x77\xaf\x25\x6f\x91\x08\xa2\x2e\x9e\xdf\x73\x6a\xb4\xae\x8e\x96\xdc\x20\x7b\x1f\xa9",
-        nonce: Some(b"\xb0\x94\xcb\x3a\x5c\x14\x40\xcf\xab\x9d\xc5\x6d\x0e\xc2\xef\xf0\x0f\x21\x10\xde\xa2\x03\x65\x4c\x70\x75\x72\x54\xaa\x59\x12\xa7\xe7\x39\x72\xe6\x07\x45\x9b\x1f\x48\x61\xe0\xb0\x8a\x5c\xc7\x63"),
-        msg: b"\x0e\x64\x6c\x6c\x3c\xc0\xf9\xfd\xed\xef\x93\x4b\x71\x95\xfe\x38\x37\x83\x6a\x9f\x6f\x26\x39\x68\xaf\x95\xef\x84\xcd\x03\x57\x50\xf3\xcd\xb6\x49\xde\x74\x5c\x87\x4a\x6e\xf6\x6b\x3d\xd8\x3b\x66\x06\x8b\x43\x35\xbc\x0a\x97\x18\x41\x82\xe3\x96\x5c\x72\x2b\x3b\x1a\xee\x48\x8c\x36\x20\xad\xb8\x35\xa8\x14\x0e\x19\x9f\x4f\xc8\x3a\x88\xb0\x28\x81\x81\x6b\x36\x6a\x09\x31\x6e\x25\x68\x52\x17\xf9\x22\x11\x57\xfc\x05\xb2\xd8\xd2\xbc\x85\x53\x72\x18\x3d\xa7\xaf\x3f\x0a\x14\x14\x8a\x09\xde\xf3\x7a\x33\x2f\x8e\xb4\x0d\xc9",
-        sig: b"\xee\x82\xc0\xf9\x05\x01\x13\x6e\xb0\xdc\x0e\x45\x9a\xd1\x7b\xf3\xbe\x1b\x1c\x8b\x8d\x05\xc6\x00\x68\xa9\x30\x6a\x34\x63\x26\xff\x73\x44\x77\x6a\x95\xf1\xf7\xe2\xe2\xcf\x94\x77\x13\x0e\x73\x5c\xaf\x10\xb9\x0f\x20\x3a\xf2\x3b\x75\x00\xe0\x70\x53\x6e\x64\x62\x9b\xa1\x92\x45\xd6\xef\x39\xaa\xb5\x7f\xcd\xb1\xb7\x3c\x4c\x6b\xf7\x07\x0c\x62\x63\x54\x46\x33\xd3\xd3\x58\xc1\x2a\x17\x81\x38",
-    },
-];
diff --git a/ecdsa/src/test_vectors/secp256k1.rs b/ecdsa/src/test_vectors/secp256k1.rs
deleted file mode 100644
index 2fb90657..00000000
--- a/ecdsa/src/test_vectors/secp256k1.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-//! ECDSA test vectors for secp256k1 fixed-size signatures
-//!
-//! TODO: find better test vectors and document where we got them from!
-
-use super::TestVector;
-
-/// ECDSA secp256k1 fixed-sized signature test vectors (self-generated, should probably be replaced)
-// TODO: Test vectors for ASN.1 encoded signatures
-#[rustfmt::skip]
-pub const SHA256_FIXED_SIZE_TEST_VECTORS: &[TestVector] = &[
-    TestVector {
-        sk: b"\x9d\x79\x48\x1a\xf0\xfa\x1e\x7c\xc8\x4f\xc4\xa8\xaa\xcf\x1e\xd2\xee\xb5\x81\xe9\x9b\x58\x38\x88\x8b\xe4\x4d\x28\x35\x31\x16\x9b",
-        pk: b"\x03\x22\xb0\xaf\xe7\x2e\x7c\x5f\x63\x53\x1c\x8c\xb4\xfe\x09\x2e\xb7\x75\xcd\x5d\x20\x8e\xbd\x2d\xbe\x7e\xbc\xda\xb1\xcf\x16\x6f\xfc",
-        nonce: None, // TODO: find test vectors with 'k' values
-        msg: b"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f\x20\x21\x22\x23\x24\x25\x26\x27\x28\x29\x2a\x2b\x2c\x2d\x2e\x2f\x30\x31\x32\x33\x34\x35\x36\x37\x38\x39\x3a\x3b\x3c\x3d\x3e\x3f\x40\x41\x42\x43\x44\x45\x46\x47\x48\x49\x4a\x4b\x4c\x4d\x4e\x4f\x50\x51\x52\x53\x54\x55\x56\x57\x58\x59\x5a\x5b\x5c\x5d\x5e\x5f\x60\x61\x62\x63\x64\x65\x66\x67\x68\x69\x6a\x6b\x6c\x6d\x6e\x6f\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79\x7a\x7b\x7c\x7d\x7e\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe",
-        sig: b"\xdc\xd0\x37\x67\x2e\xde\x6b\x10\xf6\xab\xf6\xb6\xbb\x01\x85\x37\xbb\xbe\xa4\x86\x05\x83\x84\x76\xad\x75\x81\xb3\x82\x2d\xdc\xc8\x41\xfe\x40\x30\xd8\x58\xf2\x1a\xf5\xd5\xc1\x0f\xe4\x82\xe5\x66\xfb\xbb\x34\x60\x42\xa1\x8a\x70\xa0\xc2\xbb\x62\x77\xba\xc5\x74",
-    },
-];