Merge pull request #1769 from alex/require-boringssl

Refs #1768 -- reject boringssl if unstable_boringssl feature isn't specified

Author: sfackler

openssl-sys/build/expando.c

@@ -15,6 +15,10 @@ NEW_VERSION(OPENSSL_VERSION_MAJOR, OPENSSL_VERSION_MINOR, OPENSSL_VERSION_PATCH)
 VERSION(OPENSSL, OPENSSL_VERSION_NUMBER)
 #endif
 
+#ifdef OPENSSL_IS_BORINGSSL
+RUST_OPENSSL_IS_BORINGSSL
+#endif
+
 #ifdef OPENSSL_NO_BF
 RUST_CONF_OPENSSL_NO_BF
 #endif

openssl-sys/build/main.rs

@@ -215,12 +215,14 @@ See rust-openssl documentation for more information:
     let mut enabled = vec![];
     let mut openssl_version = None;
     let mut libressl_version = None;
+    let mut is_boringssl = false;
     for line in expanded.lines() {
         let line = line.trim();
 
         let openssl_prefix = "RUST_VERSION_OPENSSL_";
         let new_openssl_prefix = "RUST_VERSION_NEW_OPENSSL_";
         let libressl_prefix = "RUST_VERSION_LIBRESSL_";
+        let boringsl_prefix = "RUST_OPENSSL_IS_BORINGSSL";
         let conf_prefix = "RUST_CONF_";
         if line.starts_with(openssl_prefix) {
             let version = &line[openssl_prefix.len()..];
@@ -233,9 +235,15 @@ See rust-openssl documentation for more information:
             libressl_version = Some(parse_version(version));
         } else if line.starts_with(conf_prefix) {
             enabled.push(&line[conf_prefix.len()..]);
+        } else if line.starts_with(boringsl_prefix) {
+            is_boringssl = true;
         }
     }
 
+    if is_boringssl {
+        panic!("BoringSSL detected, but `unstable_boringssl` feature wasn't specified.")
+    }
+
     for enabled in &enabled {
         println!("cargo:rustc-cfg=osslconf=\"{}\"", enabled);
     }