Skip to content

Add a dummy bn_is_zero C dependency to wrap BN_is_zero #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 5, 2014
Merged

Add a dummy bn_is_zero C dependency to wrap BN_is_zero #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
name = "openssl"
version = "0.0.0"
authors = ["Steven Fackler <sfackler@gmail.com"]
build = "make"

[lib]

Expand Down
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 4 additions & 0 deletions native/bn_is_zero.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include <openssl/bn.h>

int bn_is_zero(BIGNUM *x) { return BN_is_zero(x); }

1 change: 1 addition & 0 deletions native/bn_is_zero.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
int bn_is_zero(BIGNUM *x);
9 changes: 7 additions & 2 deletions src/ffi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
-> c_int;


pub static CRYPTO_LOCK: c_int = 1;

pub static MBSTRING_ASC: c_int = MBSTRING_FLAG | 1;
Expand Down Expand Up @@ -189,6 +188,9 @@ extern {}
#[link(name="wsock32")]
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" {
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;
Expand Down Expand Up @@ -239,7 +241,9 @@ extern "C" {
/* Comparisons on BIGNUMs */
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_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 */
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;
Expand Down Expand Up @@ -418,3 +422,4 @@ extern "C" {
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;
}