diff options
| author | Steven Fackler <[email protected]> | 2018-08-04 11:03:03 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-08-04 11:03:03 -0700 |
| commit | a062c62cf0c176da46db4030bfa0233482c3a7d0 (patch) | |
| tree | 1b7bba220972e39e0b37a42c991675576104b9e5 /openssl-sys | |
| parent | Update changelog (diff) | |
| parent | X509_V_ERR_UNSPECIFIED was added in 1.0.2f (diff) | |
| download | rust-openssl-a062c62cf0c176da46db4030bfa0233482c3a7d0.tar.xz rust-openssl-a062c62cf0c176da46db4030bfa0233482c3a7d0.zip | |
Merge pull request #972 from sfackler/err-unspecified-cfg
X509_V_ERR_UNSPECIFIED was added in 1.0.2f
Diffstat (limited to 'openssl-sys')
| -rw-r--r-- | openssl-sys/build/cfgs.rs | 3 | ||||
| -rw-r--r-- | openssl-sys/src/openssl/mod.rs | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/openssl-sys/build/cfgs.rs b/openssl-sys/build/cfgs.rs index 1634da6b..38bacdf3 100644 --- a/openssl-sys/build/cfgs.rs +++ b/openssl-sys/build/cfgs.rs @@ -25,6 +25,9 @@ pub fn get(openssl_version: Option<u64>, libressl_version: Option<u64>) -> Vec<& if openssl_version >= 0x1_00_02_00_0 { cfgs.push("ossl102"); } + if openssl_version >= 0x1_00_02_06_0 { + cfgs.push("ossl102f"); + } if openssl_version >= 0x1_00_02_08_0 { cfgs.push("ossl102h"); } diff --git a/openssl-sys/src/openssl/mod.rs b/openssl-sys/src/openssl/mod.rs index b65b6129..51d45575 100644 --- a/openssl-sys/src/openssl/mod.rs +++ b/openssl-sys/src/openssl/mod.rs @@ -33,6 +33,7 @@ pub const SSL_OP_NO_DTLSv1: c_ulong = 0x04000000; #[cfg(ossl102)] pub const SSL_OP_NO_DTLSv1_2: c_ulong = 0x08000000; +#[cfg(ossl102f)] pub const X509_V_ERR_UNSPECIFIED: c_int = 1; pub const CMS_TEXT: c_uint = 0x1; |