aboutsummaryrefslogtreecommitdiff
path: root/openssl
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2018-07-29 09:47:22 -0700
committerSteven Fackler <[email protected]>2018-07-29 09:48:03 -0700
commit415f399b2cdafc39ced6910adcfd3b58139646c7 (patch)
treed1aacfb177dab7fd1e950eaadc49afbaaf451186 /openssl
parentMerge pull request #962 from sfackler/static-str (diff)
downloadrust-openssl-415f399b2cdafc39ced6910adcfd3b58139646c7.tar.xz
rust-openssl-415f399b2cdafc39ced6910adcfd3b58139646c7.zip
Fix tests when built with no-ec2m
The other curve identifier isn't valid, at least in some contexts so just ignore the test in those cases. Closes #964
Diffstat (limited to 'openssl')
-rw-r--r--openssl/src/ecdsa.rs12
1 files changed, 4 insertions, 8 deletions
diff --git a/openssl/src/ecdsa.rs b/openssl/src/ecdsa.rs
index 4edbbf50..86b42677 100644
--- a/openssl/src/ecdsa.rs
+++ b/openssl/src/ecdsa.rs
@@ -142,20 +142,15 @@ mod test {
use ec::EcKey;
use nid::Nid;
- #[cfg(not(osslconf = "OPENSSL_NO_EC2M"))]
- static CURVE_IDENTIFER: Nid = Nid::X9_62_PRIME192V1;
-
- #[cfg(osslconf = "OPENSSL_NO_EC2M")]
- static CURVE_IDENTIFER: Nid = Nid::X9_62_C2TNB191V1;
-
fn get_public_key(group: &EcGroup, x: &EcKey<Private>) -> Result<EcKey<Public>, ErrorStack> {
let public_key_point = x.public_key();
Ok(EcKey::from_public_key(group, public_key_point)?)
}
#[test]
+ #[cfg_attr(osslconf = "OPENSSL_NO_EC2M", ignore)]
fn sign_and_verify() {
- let group = EcGroup::from_curve_name(CURVE_IDENTIFER).unwrap();
+ let group = EcGroup::from_curve_name(Nid::X9_62_PRIME192V1).unwrap();
let private_key = EcKey::generate(&group).unwrap();
let public_key = get_public_key(&group, &private_key).unwrap();
@@ -181,8 +176,9 @@ mod test {
}
#[test]
+ #[cfg_attr(osslconf = "OPENSSL_NO_EC2M", ignore)]
fn check_private_components() {
- let group = EcGroup::from_curve_name(CURVE_IDENTIFER).unwrap();
+ let group = EcGroup::from_curve_name(Nid::X9_62_PRIME192V1).unwrap();
let private_key = EcKey::generate(&group).unwrap();
let public_key = get_public_key(&group, &private_key).unwrap();
let data = String::from("hello");