Commit afaa2387 authored by Umang Raghuvanshi's avatar Umang Raghuvanshi
Browse files

Gate away CMS_KEY_PARAM from OpenSSL 1.0.1

parent 541458c1

openssl-sys/src/lib.rs

+1 −1
Original line number Diff line number Diff line
@@ -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;

openssl/src/cms.rs

+2 −1
Original line number Diff line number Diff line
@@ -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;

    }

}