milksad
/
rust-bitcoin-unsafe-fast
14
0
Fork 0
Code Issues Pull Requests Activity

Fix for upstream

This commit is contained in:
Andrew Poelstra 2014-09-04 19:06:52 -05:00
parent c25862a107
commit 20ce3721b7
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/blockdata/script.rs
View File

@ -36,6 +36,7 @@ use crypto::sha1::Sha1;
use crypto::sha2::Sha256; use crypto::sha2::Sha256;
use secp256k1::Secp256k1; use secp256k1::Secp256k1;
use secp256k1::Signature;
use secp256k1::key::PublicKey; use secp256k1::key::PublicKey;
use blockdata::opcodes; use blockdata::opcodes;
@ -1465,7 +1466,8 @@ fn check_signature(sig_slice: &[u8], pk_slice: &[u8], script: Vec<u8>,
serialize(&Sha256dHash::from_data(data_to_sign.as_slice())).unwrap() serialize(&Sha256dHash::from_data(data_to_sign.as_slice())).unwrap()
}; };
Secp256k1::verify(signature_hash.as_slice(), sig_slice, &pubkey).map_err(|e| EcdsaError(e)) let sig = try!(Signature::from_slice(sig_slice).map_err(EcdsaError));
Secp256k1::verify(signature_hash.as_slice(), &sig, &pubkey).map_err(EcdsaError)
} }
// Macro to translate English stack instructions into Rust code. // Macro to translate English stack instructions into Rust code.

4
src/lib.rs
View File

@ -58,8 +58,8 @@ extern crate sync;
extern crate test; extern crate test;
extern crate time; extern crate time;
extern crate secp256k1 = "bitcoin-secp256k1-rs"; extern crate "bitcoin-secp256k1-rs" as secp256k1;
extern crate crypto = "rust-crypto"; extern crate "rust-crypto" as crypto;
mod internal_macros; mod internal_macros;
pub mod macros; pub mod macros;