Upgrade to OpenSSL v3.0.0 (alexcrichton#102)

lupine · web-flow · commit 691106bd0bf6 · 2021-09-09T12:57:29.000-05:00
* Upgrade to OpenSSL v3.0.0

Signed-off-by: Nick Thomas &lt;me@ur.gs&gt;

* No longer apply musl patches
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "openssl-src"
-version = "111.16.0+1.1.1l"
+version = "300.0.0+3.0.0"
 authors = ["Alex Crichton <alex@alexcrichton.com>"]
 license = "MIT/Apache-2.0"
 readme = "README.md"
diff --git a/openssl b/openssl
@@ -1 +1 @@
-Subproject commit fb047ebc87b18bdc4cf9ddee9ee1f5ed93e56aff
+Subproject commit 89cd17a031e022211684eb7eb41190cf1910f9fa
diff --git a/src/lib.rs b/src/lib.rs
@@ -129,7 +129,6 @@ impl Build {
         let inner_dir = build_dir.join("src");
         fs::create_dir_all(&inner_dir).unwrap();
         cp_r(&source_dir(), &inner_dir);
-        apply_patches(target, &inner_dir);
 
         let perl_program =
             env::var("OPENSSL_SRC_PERL").unwrap_or(env::var("PERL").unwrap_or("perl".to_string()));
@@ -152,7 +151,11 @@ impl Build {
             // Nothing related to zlib please
             .arg("no-comp")
             .arg("no-zlib")
-            .arg("no-zlib-dynamic");
+            .arg("no-zlib-dynamic")
+            // Avoid multilib-postfix for build targets that specify it
+            .arg("--libdir=lib")
+            // No support for multiple providers yet
+            .arg("no-legacy");
 
         if cfg!(not(feature = "weak-crypto")) {
             configure
@@ -515,27 +518,6 @@ fn cp_r(src: &Path, dst: &Path) {
     }
 }
 
-fn apply_patches(target: &str, inner: &Path) {
-    apply_patches_musl(target, inner);
-}
-
-fn apply_patches_musl(target: &str, inner: &Path) {
-    if !target.contains("musl") {
-        return;
-    }
-
-    // Undo part of https://github.com/openssl/openssl/commit/c352bd07ed2ff872876534c950a6968d75ef121e on MUSL
-    // since it doesn't have asm/unistd.h
-    let path = inner.join("crypto/rand/rand_unix.c");
-    let buf = fs::read_to_string(&path).unwrap();
-
-    let buf = buf
-        .replace("asm/unistd.h", "sys/syscall.h")
-        .replace("__NR_getrandom", "SYS_getrandom");
-
-    fs::write(path, buf).unwrap();
-}
-
 fn sanitize_sh(path: &Path) -> String {
     if !cfg!(windows) {
         return path.to_str().unwrap().to_string();
