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

Merge pull request #64 from reem/fix/big-num-is-zero 

Add a dummy bn_is_zero C dependency to wrap BN_is_zero
This commit is contained in:
Steven Fackler 2014-10-04 22:06:50 -04:00
parent 78d438baef c22b3c5063
commit c09ec835fa
5 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -3,6 +3,7 @@
name = "openssl" name = "openssl"
version = "0.0.0" version = "0.0.0"
authors = ["Steven Fackler <sfackler@gmail.com"] authors = ["Steven Fackler <sfackler@gmail.com"]
build = "make"
[lib] [lib]

4
Makefile Normal file
View File

@ -0,0 +1,4 @@
default:
rm -f $(OUT_DIR)/bin_is_zero.o
$(CC) -O -shared native/bn_is_zero.c -o bn_is_zero.o
mv bn_is_zero.o $(OUT_DIR)

4
native/bn_is_zero.c Normal file
View File

@ -0,0 +1,4 @@
#include <openssl/bn.h>
int bn_is_zero(BIGNUM *x) { return BN_is_zero(x); }

1
native/bn_is_zero.h Normal file
View File

@ -0,0 +1 @@
int bn_is_zero(BIGNUM *x);

9
src/ffi.rs
View File

@ -84,7 +84,6 @@ pub type PrivateKeyWriteCallback = extern "C" fn(buf: *mut c_char, size: c_int,
rwflag: c_int, user_data: *mut c_void) rwflag: c_int, user_data: *mut c_void)
-> c_int; -> c_int;
pub static CRYPTO_LOCK: c_int = 1; pub static CRYPTO_LOCK: c_int = 1;
pub static MBSTRING_ASC: c_int = MBSTRING_FLAG | 1; pub static MBSTRING_ASC: c_int = MBSTRING_FLAG | 1;
@ -189,6 +188,9 @@ extern {}
#[link(name="wsock32")] #[link(name="wsock32")]
extern { } extern { }
/* Since the openssl BN_is_zero is sometimes a macro, this wrapper is necessary. */
pub unsafe fn BN_is_zero(a: *mut BIGNUM) -> c_int { bn_is_zero(a) }
extern "C" { extern "C" {
pub fn ASN1_INTEGER_set(dest: *mut ASN1_INTEGER, value: c_long) -> c_int; pub fn ASN1_INTEGER_set(dest: *mut ASN1_INTEGER, value: c_long) -> c_int;
pub fn ASN1_STRING_type_new(ty: c_int) -> *mut ASN1_STRING; pub fn ASN1_STRING_type_new(ty: c_int) -> *mut ASN1_STRING;
@ -239,7 +241,9 @@ extern "C" {
/* Comparisons on BIGNUMs */ /* Comparisons on BIGNUMs */
pub fn BN_cmp(a: *mut BIGNUM, b: *mut BIGNUM) -> c_int; pub fn BN_cmp(a: *mut BIGNUM, b: *mut BIGNUM) -> c_int;
pub fn BN_ucmp(a: *mut BIGNUM, b: *mut BIGNUM) -> c_int; pub fn BN_ucmp(a: *mut BIGNUM, b: *mut BIGNUM) -> c_int;
pub fn BN_is_zero(a: *mut BIGNUM) -> c_int;
/* Special import from native/bn_is_zero.c */
pub fn bn_is_zero(a: *mut BIGNUM) -> c_int;
/* Prime handling */ /* Prime handling */
pub fn BN_generate_prime_ex(r: *mut BIGNUM, bits: c_int, safe: c_int, add: *mut BIGNUM, rem: *mut BIGNUM, cb: *const c_void) -> c_int; pub fn BN_generate_prime_ex(r: *mut BIGNUM, bits: c_int, safe: c_int, add: *mut BIGNUM, rem: *mut BIGNUM, cb: *const c_void) -> c_int;
@ -419,3 +423,4 @@ extern "C" {
pub fn i2d_RSAPrivateKey(k: *mut RSA, buf: *const *mut u8) -> c_int; pub fn i2d_RSAPrivateKey(k: *mut RSA, buf: *const *mut u8) -> c_int;
pub fn d2i_RSAPrivateKey(k: *const *mut RSA, buf: *const *const u8, len: c_uint) -> *mut RSA; pub fn d2i_RSAPrivateKey(k: *const *mut RSA, buf: *const *const u8, len: c_uint) -> *mut RSA;
} }