From c22b3c5063da942954b0b71b03317bf2da058c7e Mon Sep 17 00:00:00 2001
From: Jonathan Reem <jonathan.reem@gmail.com>
Date: Sat, 4 Oct 2014 18:18:02 -0700
Subject: [PATCH] Add a dummy bn_is_zero C dependency to wrap BN_is_zero

This is necessary because on some architectures BN_is_zero
is a CPP macro, so trying to link against it in an `extern "C"`
block causes a linker error.

This also introduces a build command to Cargo to compile
the bn_is_zero wrapper.
---
 Cargo.toml          | 1 +
 Makefile            | 4 ++++
 native/bn_is_zero.c | 4 ++++
 native/bn_is_zero.h | 1 +
 src/ffi.rs          | 9 +++++++--
 5 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 Makefile
 create mode 100644 native/bn_is_zero.c
 create mode 100644 native/bn_is_zero.h

diff --git a/Cargo.toml b/Cargo.toml
index 4c61dd7e7..4af5bac9e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,6 +3,7 @@
 name = "openssl"
 version = "0.0.0"
 authors = ["Steven Fackler <sfackler@gmail.com"]
+build = "make"
 
 [lib]
 
diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000..c88ebeaec
--- /dev/null
+++ b/Makefile
@@ -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)
diff --git a/native/bn_is_zero.c b/native/bn_is_zero.c
new file mode 100644
index 000000000..b0a4300b4
--- /dev/null
+++ b/native/bn_is_zero.c
@@ -0,0 +1,4 @@
+#include <openssl/bn.h>
+
+int bn_is_zero(BIGNUM *x) { return BN_is_zero(x); }
+
diff --git a/native/bn_is_zero.h b/native/bn_is_zero.h
new file mode 100644
index 000000000..8ec36c35d
--- /dev/null
+++ b/native/bn_is_zero.h
@@ -0,0 +1 @@
+int bn_is_zero(BIGNUM *x);
diff --git a/src/ffi.rs b/src/ffi.rs
index b31dc1bb6..afa11a4e8 100644
--- a/src/ffi.rs
+++ b/src/ffi.rs
@@ -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;
@@ -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;
@@ -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;
@@ -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;
 }
+
-- 
GitLab