From 541458c1c165ef1bbc6f9b949f9956fcf3c37ae6 Mon Sep 17 00:00:00 2001 From: Umang Raghuvanshi Date: Thu, 10 May 2018 20:48:38 +0530 Subject: [PATCH] Properly version-gate CMS constants --- openssl-sys/src/lib.rs | 21 +++++++++++++++++++++ openssl/src/cms.rs | 1 + 2 files changed, 22 insertions(+) diff --git a/openssl-sys/src/lib.rs b/openssl-sys/src/lib.rs index 4b9c4cb8..b07d5ab6 100644 --- a/openssl-sys/src/lib.rs +++ b/openssl-sys/src/lib.rs @@ -1467,26 +1467,47 @@ pub const DTLS1_COOKIE_LENGTH: c_uint = 256; #[cfg(not(libressl))] pub const CMS_TEXT: c_uint = 0x1; +#[cfg(not(libressl))] pub const CMS_NOCERTS: c_uint = 0x2; +#[cfg(not(libressl))] pub const CMS_NO_CONTENT_VERIFY: c_uint = 0x4; +#[cfg(not(libressl))] pub const CMS_NO_ATTR_VERIFY: c_uint = 0x8; +#[cfg(not(libressl))] pub const CMS_NOSIGS: c_uint = 0x4 | 0x8; +#[cfg(not(libressl))] pub const CMS_NOINTERN: c_uint = 0x10; +#[cfg(not(libressl))] pub const CMS_NO_SIGNER_CERT_VERIFY: c_uint = 0x20; +#[cfg(not(libressl))] pub const CMS_NOVERIFY: c_uint = 0x20; +#[cfg(not(libressl))] pub const CMS_DETACHED: c_uint = 0x40; +#[cfg(not(libressl))] pub const CMS_BINARY: c_uint = 0x80; +#[cfg(not(libressl))] pub const CMS_NOATTR: c_uint = 0x100; +#[cfg(not(libressl))] pub const CMS_NOSMIMECAP: c_uint = 0x200; +#[cfg(not(libressl))] pub const CMS_NOOLDMIMETYPE: c_uint = 0x400; +#[cfg(not(libressl))] pub const CMS_CRLFEOL: c_uint = 0x800; +#[cfg(not(libressl))] pub const CMS_STREAM: c_uint = 0x1000; +#[cfg(not(libressl))] pub const CMS_NOCRL: c_uint = 0x2000; +#[cfg(not(libressl))] pub const CMS_PARTIAL: c_uint = 0x4000; +#[cfg(not(libressl))] pub const CMS_REUSE_DIGEST: c_uint = 0x8000; +#[cfg(not(libressl))] pub const CMS_USE_KEYID: c_uint = 0x10000; +#[cfg(not(libressl))] pub const CMS_DEBUG_DECRYPT: c_uint = 0x20000; +#[cfg(not(libressl))] pub const CMS_KEY_PARAM: c_uint = 0x40000; +#[cfg(all(not(libressl), not(ossl101), not(ossl102)))] pub const CMS_ASCIICRLF: c_uint = 0x80000; // macros diff --git a/openssl/src/cms.rs b/openssl/src/cms.rs index 1884c568..0583d086 100644 --- a/openssl/src/cms.rs +++ b/openssl/src/cms.rs @@ -40,6 +40,7 @@ bitflags! { const USE_KEYID = ffi::CMS_USE_KEYID; const DEBUG_DECRYPT = ffi::CMS_DEBUG_DECRYPT; const KEY_PARAM = ffi::CMS_KEY_PARAM; + #[cfg(all(not(libressl), any(ossl101, ossl102)))] const ASCIICRLF = ffi::CMS_ASCIICRLF; } }