diff options
| author | Umang Raghuvanshi <[email protected]> | 2018-05-10 21:33:51 +0530 |
|---|---|---|
| committer | Umang Raghuvanshi <[email protected]> | 2018-05-10 21:41:59 +0530 |
| commit | afaa2387c89a6e7d2d8c2ee05d4ecb605b5188e1 (patch) | |
| tree | f0daa89071f9fb693da213e7b76f165b35949106 | |
| parent | Properly version-gate CMS constants (diff) | |
| download | rust-openssl-afaa2387c89a6e7d2d8c2ee05d4ecb605b5188e1.tar.xz rust-openssl-afaa2387c89a6e7d2d8c2ee05d4ecb605b5188e1.zip | |
Gate away CMS_KEY_PARAM from OpenSSL 1.0.1
| -rw-r--r-- | openssl-sys/src/lib.rs | 2 | ||||
| -rw-r--r-- | openssl/src/cms.rs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs index b07d5ab6..de24d94e 100644 --- a/openssl-sys/src/lib.rs +++ b/openssl-sys/src/lib.rs @@ -1505,7 +1505,7 @@ pub const CMS_REUSE_DIGEST: c_uint = 0x8000; pub const CMS_USE_KEYID: c_uint = 0x10000; #[cfg(not(libressl))] pub const CMS_DEBUG_DECRYPT: c_uint = 0x20000; -#[cfg(not(libressl))] +#[cfg(all(not(libressl), not(ossl101)))] pub const CMS_KEY_PARAM: c_uint = 0x40000; #[cfg(all(not(libressl), not(ossl101), not(ossl102)))] pub const CMS_ASCIICRLF: c_uint = 0x80000; diff --git a/openssl/src/cms.rs b/openssl/src/cms.rs index 0583d086..6ee62fd0 100644 --- a/openssl/src/cms.rs +++ b/openssl/src/cms.rs @@ -39,8 +39,9 @@ bitflags! { const REUSE_DIGEST = ffi::CMS_REUSE_DIGEST; const USE_KEYID = ffi::CMS_USE_KEYID; const DEBUG_DECRYPT = ffi::CMS_DEBUG_DECRYPT; + #[cfg(all(not(libressl), not(ossl101)))] const KEY_PARAM = ffi::CMS_KEY_PARAM; - #[cfg(all(not(libressl), any(ossl101, ossl102)))] + #[cfg(all(not(libressl), not(ossl101), not(ossl102)))] const ASCIICRLF = ffi::CMS_ASCIICRLF; } } |