min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Gate away CMS_KEY_PARAM from OpenSSL 1.0.1

This commit is contained in:
Umang Raghuvanshi 2018-05-10 21:33:51 +05:30
parent 541458c1c1
commit afaa2387c8
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openssl-sys/src/lib.rs
View File

@ -1505,7 +1505,7 @@ pub const CMS_REUSE_DIGEST: c_uint = 0x8000;
pub const CMS_USE_KEYID: c_uint = 0x10000; pub const CMS_USE_KEYID: c_uint = 0x10000;
#[cfg(not(libressl))] #[cfg(not(libressl))]
pub const CMS_DEBUG_DECRYPT: c_uint = 0x20000; 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; pub const CMS_KEY_PARAM: c_uint = 0x40000;
#[cfg(all(not(libressl), not(ossl101), not(ossl102)))] #[cfg(all(not(libressl), not(ossl101), not(ossl102)))]
pub const CMS_ASCIICRLF: c_uint = 0x80000; pub const CMS_ASCIICRLF: c_uint = 0x80000;

3
openssl/src/cms.rs
View File

@ -39,8 +39,9 @@ bitflags! {
const REUSE_DIGEST = ffi::CMS_REUSE_DIGEST; const REUSE_DIGEST = ffi::CMS_REUSE_DIGEST;
const USE_KEYID = ffi::CMS_USE_KEYID; const USE_KEYID = ffi::CMS_USE_KEYID;
const DEBUG_DECRYPT = ffi::CMS_DEBUG_DECRYPT; const DEBUG_DECRYPT = ffi::CMS_DEBUG_DECRYPT;
#[cfg(all(not(libressl), not(ossl101)))]
const KEY_PARAM = ffi::CMS_KEY_PARAM; 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; const ASCIICRLF = ffi::CMS_ASCIICRLF;
} }
} }