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

Merge pull request #87 from tomaka/rm-libc 

Remove dependency on libc
This commit is contained in:
Matt Corallo 2018-12-27 11:55:24 -05:00 committed by GitHub
parent 7d7085c304 9c45944a5f
commit 4f44a0f3bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Cargo.toml
View File

@ -34,9 +34,6 @@ fuzztarget = []
rand = "0.4" rand = "0.4"
serde_test = "1.0" serde_test = "1.0"
[dependencies]
libc = "0.2"
[dependencies.rand] [dependencies.rand]
version = "0.4" version = "0.4"
optional = true optional = true

27
src/ffi.rs
View File

@ -18,8 +18,7 @@
//! not be needed for most users. //! not be needed for most users.
use std::mem; use std::mem;
use std::hash; use std::hash;
use std::os::raw::{c_int, c_uchar, c_uint, c_void};
use libc::{c_int, c_uchar, c_uint, c_void, size_t};
/// Flag for context to enable no precomputation /// Flag for context to enable no precomputation
pub const SECP256K1_START_NONE: c_uint = (1 << 0) | 0; pub const SECP256K1_START_NONE: c_uint = (1 << 0) | 0;
@ -151,17 +150,17 @@ extern "C" {
// Pubkeys // Pubkeys
pub fn secp256k1_ec_pubkey_parse(cx: *const Context, pk: *mut PublicKey, pub fn secp256k1_ec_pubkey_parse(cx: *const Context, pk: *mut PublicKey,
input: *const c_uchar, in_len: size_t) input: *const c_uchar, in_len: usize)
-> c_int; -> c_int;
pub fn secp256k1_ec_pubkey_serialize(cx: *const Context, output: *mut c_uchar, pub fn secp256k1_ec_pubkey_serialize(cx: *const Context, output: *mut c_uchar,
out_len: *mut size_t, pk: *const PublicKey, out_len: *mut usize, pk: *const PublicKey,
compressed: c_uint) compressed: c_uint)
-> c_int; -> c_int;
// Signatures // Signatures
pub fn secp256k1_ecdsa_signature_parse_der(cx: *const Context, sig: *mut Signature, pub fn secp256k1_ecdsa_signature_parse_der(cx: *const Context, sig: *mut Signature,
input: *const c_uchar, in_len: size_t) input: *const c_uchar, in_len: usize)
-> c_int; -> c_int;
pub fn secp256k1_ecdsa_signature_parse_compact(cx: *const Context, sig: *mut Signature, pub fn secp256k1_ecdsa_signature_parse_compact(cx: *const Context, sig: *mut Signature,
@ -169,11 +168,11 @@ extern "C" {
-> c_int; -> c_int;
pub fn ecdsa_signature_parse_der_lax(cx: *const Context, sig: *mut Signature, pub fn ecdsa_signature_parse_der_lax(cx: *const Context, sig: *mut Signature,
input: *const c_uchar, in_len: size_t) input: *const c_uchar, in_len: usize)
-> c_int; -> c_int;
pub fn secp256k1_ecdsa_signature_serialize_der(cx: *const Context, output: *mut c_uchar, pub fn secp256k1_ecdsa_signature_serialize_der(cx: *const Context, output: *mut c_uchar,
out_len: *mut size_t, sig: *const Signature) out_len: *mut usize, sig: *const Signature)
-> c_int; -> c_int;
pub fn secp256k1_ecdsa_signature_serialize_compact(cx: *const Context, output64: *const c_uchar, pub fn secp256k1_ecdsa_signature_serialize_compact(cx: *const Context, output64: *const c_uchar,
@ -273,7 +272,7 @@ extern "C" {
#[cfg(feature = "fuzztarget")] #[cfg(feature = "fuzztarget")]
mod fuzz_dummy { mod fuzz_dummy {
use libc::{c_int, c_uchar, c_uint, c_void, size_t}; use std::os::raw::{c_int, c_uchar, c_uint, c_void};
use ffi::*; use ffi::*;
use std::ptr; use std::ptr;
@ -319,7 +318,7 @@ mod fuzz_dummy {
// Pubkeys // Pubkeys
/// Parse 33/65 byte pubkey into PublicKey, losing compressed information /// Parse 33/65 byte pubkey into PublicKey, losing compressed information
pub unsafe fn secp256k1_ec_pubkey_parse(cx: *const Context, pk: *mut PublicKey, pub unsafe fn secp256k1_ec_pubkey_parse(cx: *const Context, pk: *mut PublicKey,
input: *const c_uchar, in_len: size_t) input: *const c_uchar, in_len: usize)
-> c_int { -> c_int {
assert!(!cx.is_null() && (*cx).0 as u32 & !(SECP256K1_START_NONE | SECP256K1_START_VERIFY | SECP256K1_START_SIGN) == 0); assert!(!cx.is_null() && (*cx).0 as u32 & !(SECP256K1_START_NONE | SECP256K1_START_VERIFY | SECP256K1_START_SIGN) == 0);
match in_len { match in_len {
@ -346,7 +345,7 @@ mod fuzz_dummy {
/// Serialize PublicKey back to 33/65 byte pubkey /// Serialize PublicKey back to 33/65 byte pubkey
pub unsafe fn secp256k1_ec_pubkey_serialize(cx: *const Context, output: *mut c_uchar, pub unsafe fn secp256k1_ec_pubkey_serialize(cx: *const Context, output: *mut c_uchar,
out_len: *mut size_t, pk: *const PublicKey, out_len: *mut usize, pk: *const PublicKey,
compressed: c_uint) compressed: c_uint)
-> c_int { -> c_int {
assert!(!cx.is_null() && (*cx).0 as u32 & !(SECP256K1_START_NONE | SECP256K1_START_VERIFY | SECP256K1_START_SIGN) == 0); assert!(!cx.is_null() && (*cx).0 as u32 & !(SECP256K1_START_NONE | SECP256K1_START_VERIFY | SECP256K1_START_SIGN) == 0);
@ -371,7 +370,7 @@ mod fuzz_dummy {
// Signatures // Signatures
pub unsafe fn secp256k1_ecdsa_signature_parse_der(cx: *const Context, sig: *mut Signature, pub unsafe fn secp256k1_ecdsa_signature_parse_der(cx: *const Context, sig: *mut Signature,
input: *const c_uchar, in_len: size_t) input: *const c_uchar, in_len: usize)
-> c_int { -> c_int {
unimplemented!(); unimplemented!();
} }
@ -387,14 +386,14 @@ mod fuzz_dummy {
} }
pub unsafe fn ecdsa_signature_parse_der_lax(cx: *const Context, sig: *mut Signature, pub unsafe fn ecdsa_signature_parse_der_lax(cx: *const Context, sig: *mut Signature,
input: *const c_uchar, in_len: size_t) input: *const c_uchar, in_len: usize)
-> c_int { -> c_int {
unimplemented!(); unimplemented!();
} }
/// Copies up to 72 bytes into output from sig /// Copies up to 72 bytes into output from sig
pub unsafe fn secp256k1_ecdsa_signature_serialize_der(cx: *const Context, output: *mut c_uchar, pub unsafe fn secp256k1_ecdsa_signature_serialize_der(cx: *const Context, output: *mut c_uchar,
out_len: *mut size_t, sig: *const Signature) out_len: *mut usize, sig: *const Signature)
-> c_int { -> c_int {
assert!(!cx.is_null() && (*cx).0 as u32 & !(SECP256K1_START_NONE | SECP256K1_START_VERIFY | SECP256K1_START_SIGN) == 0); assert!(!cx.is_null() && (*cx).0 as u32 & !(SECP256K1_START_NONE | SECP256K1_START_VERIFY | SECP256K1_START_SIGN) == 0);
@ -407,7 +406,7 @@ mod fuzz_dummy {
len_s -= 1; len_s -= 1;
} }
assert!(*out_len >= (6 + len_s + len_r) as size_t); assert!(*out_len >= (6 + len_s + len_r) as usize);
*output.offset(0) = 0x30; *output.offset(0) = 0x30;
*output.offset(1) = 4 + len_r + len_s; *output.offset(1) = 4 + len_r + len_s;

6
src/key.rs
View File

@ -243,7 +243,7 @@ impl PublicKey {
ffi::secp256k1_context_no_precomp, ffi::secp256k1_context_no_precomp,
&mut pk, &mut pk,
data.as_ptr(), data.as_ptr(),
data.len() as ::libc::size_t, data.len() as usize,
) == 1 ) == 1
{ {
Ok(PublicKey(pk)) Ok(PublicKey(pk))
@ -261,7 +261,7 @@ impl PublicKey {
let mut ret = [0; constants::PUBLIC_KEY_SIZE]; let mut ret = [0; constants::PUBLIC_KEY_SIZE];
unsafe { unsafe {
let mut ret_len = constants::PUBLIC_KEY_SIZE as ::libc::size_t; let mut ret_len = constants::PUBLIC_KEY_SIZE as usize;
let err = ffi::secp256k1_ec_pubkey_serialize( let err = ffi::secp256k1_ec_pubkey_serialize(
ffi::secp256k1_context_no_precomp, ffi::secp256k1_context_no_precomp,
ret.as_mut_ptr(), ret.as_mut_ptr(),
@ -280,7 +280,7 @@ impl PublicKey {
let mut ret = [0; constants::UNCOMPRESSED_PUBLIC_KEY_SIZE]; let mut ret = [0; constants::UNCOMPRESSED_PUBLIC_KEY_SIZE];
unsafe { unsafe {
let mut ret_len = constants::UNCOMPRESSED_PUBLIC_KEY_SIZE as ::libc::size_t; let mut ret_len = constants::UNCOMPRESSED_PUBLIC_KEY_SIZE as usize;
let err = ffi::secp256k1_ec_pubkey_serialize( let err = ffi::secp256k1_ec_pubkey_serialize(
ffi::secp256k1_context_no_precomp, ffi::secp256k1_context_no_precomp,
ret.as_mut_ptr(), ret.as_mut_ptr(),

11
src/lib.rs
View File

@ -139,9 +139,6 @@
#[cfg(feature = "serde")] pub extern crate serde; #[cfg(feature = "serde")] pub extern crate serde;
#[cfg(all(test, feature = "serde"))] extern crate serde_test; #[cfg(all(test, feature = "serde"))] extern crate serde_test;
pub extern crate libc;
use libc::size_t;
use std::{error, fmt, ptr, str}; use std::{error, fmt, ptr, str};
#[cfg(any(test, feature = "rand"))] use rand::Rng; #[cfg(any(test, feature = "rand"))] use rand::Rng;
@ -173,7 +170,7 @@ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
impl fmt::Display for Signature { impl fmt::Display for Signature {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let mut v = [0; 72]; let mut v = [0; 72];
let mut len = v.len() as size_t; let mut len = v.len() as usize;
unsafe { unsafe {
let err = ffi::secp256k1_ecdsa_signature_serialize_der( let err = ffi::secp256k1_ecdsa_signature_serialize_der(
ffi::secp256k1_context_no_precomp, ffi::secp256k1_context_no_precomp,
@ -241,7 +238,7 @@ impl Signature {
ffi::secp256k1_context_no_precomp, ffi::secp256k1_context_no_precomp,
&mut ret, &mut ret,
data.as_ptr(), data.as_ptr(),
data.len() as libc::size_t, data.len() as usize,
) == 1 ) == 1
{ {
Ok(Signature(ret)) Ok(Signature(ret))
@ -283,7 +280,7 @@ impl Signature {
ffi::secp256k1_context_no_precomp, ffi::secp256k1_context_no_precomp,
&mut ret, &mut ret,
data.as_ptr(), data.as_ptr(),
data.len() as libc::size_t, data.len() as usize,
) == 1 ) == 1
{ {
Ok(Signature(ret)) Ok(Signature(ret))
@ -338,7 +335,7 @@ impl Signature {
/// Serializes the signature in DER format /// Serializes the signature in DER format
pub fn serialize_der(&self) -> Vec<u8> { pub fn serialize_der(&self) -> Vec<u8> {
let mut ret = Vec::with_capacity(72); let mut ret = Vec::with_capacity(72);
let mut len: size_t = ret.capacity() as size_t; let mut len: usize = ret.capacity() as usize;
unsafe { unsafe {
let err = ffi::secp256k1_ecdsa_signature_serialize_der( let err = ffi::secp256k1_ecdsa_signature_serialize_der(
ffi::secp256k1_context_no_precomp, ffi::secp256k1_context_no_precomp,