From bbae793eb3ba06e5ad8813ce8182e52fb4a2abd3 Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Mon, 25 Dec 2017 19:38:00 -0700 Subject: Upgrade bitflags to 1.0 Closes #756 --- openssl/src/sign.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'openssl/src/sign.rs') diff --git a/openssl/src/sign.rs b/openssl/src/sign.rs index a90d1570..3155463a 100644 --- a/openssl/src/sign.rs +++ b/openssl/src/sign.rs @@ -353,7 +353,7 @@ mod test { use hash::MessageDigest; use sign::{Signer, Verifier}; use ec::{EcGroup, EcKey}; - use nid; + use nid::Nid; use rsa::{PKCS1_PADDING, Rsa}; use dsa::Dsa; use pkey::PKey; @@ -569,7 +569,7 @@ mod test { #[test] fn ec() { - let group = EcGroup::from_curve_name(nid::X9_62_PRIME256V1).unwrap(); + let group = EcGroup::from_curve_name(Nid::X9_62_PRIME256V1).unwrap(); let key = EcKey::generate(&group).unwrap(); let key = PKey::from_ec_key(key).unwrap(); -- cgit v1.2.3 From 3eab162dc21519b0341c68dec4d412d10c91bdcf Mon Sep 17 00:00:00 2001 From: Steven Fackler Date: Mon, 25 Dec 2017 19:56:27 -0700 Subject: Move to associated consts --- openssl/src/sign.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'openssl/src/sign.rs') diff --git a/openssl/src/sign.rs b/openssl/src/sign.rs index 3155463a..4a0af9d7 100644 --- a/openssl/src/sign.rs +++ b/openssl/src/sign.rs @@ -354,7 +354,7 @@ mod test { use sign::{Signer, Verifier}; use ec::{EcGroup, EcKey}; use nid::Nid; - use rsa::{PKCS1_PADDING, Rsa}; + use rsa::{Padding, Rsa}; use dsa::Dsa; use pkey::PKey; @@ -378,10 +378,10 @@ mod test { let pkey = PKey::from_rsa(private_key).unwrap(); let mut signer = Signer::new(MessageDigest::sha256(), &pkey).unwrap(); - assert_eq!(signer.pkey_ctx_mut().rsa_padding().unwrap(), PKCS1_PADDING); + assert_eq!(signer.pkey_ctx_mut().rsa_padding().unwrap(), Padding::PKCS1); signer .pkey_ctx_mut() - .set_rsa_padding(PKCS1_PADDING) + .set_rsa_padding(Padding::PKCS1) .unwrap(); signer.update(&Vec::from_hex(INPUT).unwrap()).unwrap(); let result = signer.sign_to_vec().unwrap(); @@ -398,7 +398,7 @@ mod test { let mut verifier = Verifier::new(MessageDigest::sha256(), &pkey).unwrap(); assert_eq!( verifier.pkey_ctx_mut().rsa_padding().unwrap(), - PKCS1_PADDING + Padding::PKCS1 ); verifier.update(&Vec::from_hex(INPUT).unwrap()).unwrap(); assert!(verifier.verify(&Vec::from_hex(SIGNATURE).unwrap()).unwrap()); -- cgit v1.2.3