aboutsummaryrefslogtreecommitdiff
path: root/openssl/src/macros.rs
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2016-10-14 11:39:43 -0700
committerGitHub <[email protected]>2016-10-14 11:39:43 -0700
commit98e71596fb48ce7cdabd46e581f32a9a54398cce (patch)
tree7d600055248d58edfccd4ed5577c32c86bac3ff2 /openssl/src/macros.rs
parentRename NoPadding to None (diff)
parentIgnore DTLS tests on Windows/ARM for now (diff)
downloadrust-openssl-98e71596fb48ce7cdabd46e581f32a9a54398cce.tar.xz
rust-openssl-98e71596fb48ce7cdabd46e581f32a9a54398cce.zip
Merge pull request #464 from alexcrichton/systest
Add support for OpenSSL 1.1.0
Diffstat (limited to 'openssl/src/macros.rs')
-rw-r--r--openssl/src/macros.rs14
1 files changed, 14 insertions, 0 deletions
diff --git a/openssl/src/macros.rs b/openssl/src/macros.rs
index e2d9cae5..31c298fa 100644
--- a/openssl/src/macros.rs
+++ b/openssl/src/macros.rs
@@ -80,3 +80,17 @@ macro_rules! lift_ssl_returns_size {
}
})
}
+
+#[cfg(ossl10x)]
+macro_rules! CRYPTO_free {
+ ($e:expr) => (::ffi::CRYPTO_free($e))
+}
+
+#[cfg(ossl110)]
+macro_rules! CRYPTO_free {
+ ($e:expr) => (
+ ::ffi::CRYPTO_free($e,
+ concat!(file!(), "\0").as_ptr() as *const _,
+ line!() as i32)
+ )
+}