diff options
| author | Steven Fackler <[email protected]> | 2017-11-06 11:23:13 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-11-06 11:23:13 -0800 |
| commit | feb4c94719351b074e484fd548264072cbe256dd (patch) | |
| tree | 9b59d87f445776506cadd2d15ead743cc8d48b45 | |
| parent | Add a couple of FIXMEs (diff) | |
| parent | Fix LibreSSL cms.h detection (diff) | |
| download | rust-openssl-feb4c94719351b074e484fd548264072cbe256dd.tar.xz rust-openssl-feb4c94719351b074e484fd548264072cbe256dd.zip | |
Merge pull request #771 from myfreeweb/libressl-cms-h-fix
Fix LibreSSL cms.h detection
| -rw-r--r-- | .circleci/config.yml | 1 | ||||
| -rw-r--r-- | systest/build.rs | 10 |
2 files changed, 4 insertions, 7 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index f20f866a..4e8695e8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -35,6 +35,7 @@ job: &JOB steps: - checkout - run: apt-get update + - run: apt-get remove -y libssl-dev - run: ./test/add_target.sh - *RESTORE_REGISTRY - run: cargo generate-lockfile diff --git a/systest/build.rs b/systest/build.rs index 7418cca0..af8ebbc1 100644 --- a/systest/build.rs +++ b/systest/build.rs @@ -5,6 +5,7 @@ use std::env; fn main() { let mut cfg = ctest::TestGenerator::new(); let target = env::var("TARGET").unwrap(); + let mut is_libressl = false; if let Ok(out) = env::var("DEP_OPENSSL_INCLUDE") { cfg.include(&out); @@ -24,6 +25,7 @@ fn main() { if let Ok(_) = env::var("DEP_OPENSSL_LIBRESSL") { cfg.cfg("libressl", None); + is_libressl = true; } else if let Ok(version) = env::var("DEP_OPENSSL_VERSION") { cfg.cfg(&format!("ossl{}", version), None); } @@ -41,12 +43,6 @@ fn main() { } } - let has_cms_h = if let Ok(version) = env::var("DEP_OPENSSL_LIBRESSL_VERSION") { - version != "261" && version != "262" - } else { - true - }; - cfg.header("openssl/comp.h") .header("openssl/dh.h") .header("openssl/ossl_typ.h") @@ -64,7 +60,7 @@ fn main() { .header("openssl/aes.h") .header("openssl/ocsp.h"); - if has_cms_h { + if !is_libressl { cfg.header("openssl/cms.h"); } |