min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert previous commit

This commit is contained in:
Rohit Aggarwal 2018-03-11 07:41:22 +00:00
parent bc304565e7
commit c0a4bc4202
No known key found for this signature in database
GPG Key ID: 0CEC9082DF18FAAA
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openssl/src/ecdsa.rs
View File

@ -2,13 +2,14 @@
//! //!
use bn::BigNumRef; use bn::{BigNum, BigNumRef};
use {cvt, cvt_n, cvt_p}; use {cvt, cvt_n, cvt_p};
use ec::EcKeyRef; use ec::EcKeyRef;
use error::ErrorStack; use error::ErrorStack;
use ffi; use ffi;
use foreign_types::{ForeignType, ForeignTypeRef}; use foreign_types::{ForeignType, ForeignTypeRef};
use pkey::{Private, Public}; use pkey::{Private, Public};
use std::mem;
foreign_type_and_impl_send_sync! { foreign_type_and_impl_send_sync! {
@ -47,10 +48,11 @@ impl EcdsaSig {
/// OpenSSL documentation at [`ECDSA_SIG_set0`] /// OpenSSL documentation at [`ECDSA_SIG_set0`]
/// ///
/// [`ECDSA_SIG_set0`]: https://www.openssl.org/docs/man1.1.0/crypto/ECDSA_SIG_set0.html /// [`ECDSA_SIG_set0`]: https://www.openssl.org/docs/man1.1.0/crypto/ECDSA_SIG_set0.html
pub fn from_private_components(r: &BigNumRef, s: &BigNumRef) -> Result<EcdsaSig, ErrorStack> { pub fn from_private_components(r: BigNum, s: BigNum) -> Result<EcdsaSig, ErrorStack> {
unsafe { unsafe {
let sig = cvt_p(ffi::ECDSA_SIG_new())?; let sig = cvt_p(ffi::ECDSA_SIG_new())?;
cvt(compat::set_numbers(sig, r.as_ptr(), s.as_ptr()))?; cvt(compat::set_numbers(sig, r.as_ptr(), s.as_ptr()))?;
mem::forget((r, s));
Ok(EcdsaSig::from_ptr(sig as *mut _)) Ok(EcdsaSig::from_ptr(sig as *mut _))
} }
} }
@ -187,7 +189,7 @@ mod test {
let r = res.private_component_r().unwrap().to_owned().unwrap(); let r = res.private_component_r().unwrap().to_owned().unwrap();
let s = res.private_component_s().unwrap().to_owned().unwrap(); let s = res.private_component_s().unwrap().to_owned().unwrap();
let res2 = EcdsaSig::from_private_components(&r, &s).unwrap(); let res2 = EcdsaSig::from_private_components(r, s).unwrap();
let verification2 = res2.verify(data.as_bytes(), &public_key).unwrap(); let verification2 = res2.verify(data.as_bytes(), &public_key).unwrap();
assert!(verification2); assert!(verification2);
} }