aboutsummaryrefslogtreecommitdiff
path: root/openssl-sys/src
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2017-04-13 16:17:09 -0700
committerGitHub <[email protected]>2017-04-13 16:17:09 -0700
commit174617340a9802815f6899ea1e62f08c4736e2ac (patch)
treeceec24e04e0c02d4e6d66c8b49f314270f32ac05 /openssl-sys/src
parentMerge pull request #613 from aosmond/add_evp_pkey_derive (diff)
parent(issues-600) Avoid compiling ec2m code against no-ec2m openssl (diff)
downloadrust-openssl-174617340a9802815f6899ea1e62f08c4736e2ac.tar.xz
rust-openssl-174617340a9802815f6899ea1e62f08c4736e2ac.zip
Merge pull request #615 from ajroetker/issue-600/avoid_compiling_ec_code_against_no-ec2m_openssl
(issues-600) Avoid compiling ec code against no-ec2m openssl
Diffstat (limited to 'openssl-sys/src')
-rw-r--r--openssl-sys/src/lib.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs
index f7c50822..a01e33fe 100644
--- a/openssl-sys/src/lib.rs
+++ b/openssl-sys/src/lib.rs
@@ -1521,13 +1521,16 @@ extern {
pub fn EC_KEY_check_key(key: *const EC_KEY) -> c_int;
pub fn EC_KEY_free(key: *mut EC_KEY);
+ #[cfg(not(osslconf = "OPENSSL_NO_EC2M"))]
pub fn EC_GF2m_simple_method() -> *const EC_METHOD;
pub fn EC_GROUP_new(meth: *const EC_METHOD) -> *mut EC_GROUP;
pub fn EC_GROUP_new_curve_GFp(p: *const BIGNUM, a: *const BIGNUM, b: *const BIGNUM, ctx: *mut BN_CTX) -> *mut EC_GROUP;
+ #[cfg(not(osslconf = "OPENSSL_NO_EC2M"))]
pub fn EC_GROUP_new_curve_GF2m(p: *const BIGNUM, a: *const BIGNUM, b: *const BIGNUM, ctx: *mut BN_CTX) -> *mut EC_GROUP;
pub fn EC_GROUP_new_by_curve_name(nid: c_int) -> *mut EC_GROUP;
pub fn EC_GROUP_get_curve_GFp(group: *const EC_GROUP, p: *mut BIGNUM, a: *mut BIGNUM, b: *mut BIGNUM, ctx: *mut BN_CTX) -> c_int;
+ #[cfg(not(osslconf = "OPENSSL_NO_EC2M"))]
pub fn EC_GROUP_get_curve_GF2m(group: *const EC_GROUP, p: *mut BIGNUM, a: *mut BIGNUM, b: *mut BIGNUM, ctx: *mut BN_CTX) -> c_int;
pub fn EC_GROUP_get_degree(group: *const EC_GROUP) -> c_int;
pub fn EC_GROUP_get_order(group: *const EC_GROUP, order: *mut BIGNUM, ctx: *mut BN_CTX) -> c_int;