diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2020-02-14 12:57:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-14 12:57:22 -0500 |
| commit | cdd5dc17aa8f1c0764180ee25e1a2b86a2c4af81 (patch) | |
| tree | 249f0fcc393ec70546ee906acf5ef940d1d26ea4 /python | |
| parent | 4f36472b6fed75568c651cbbeecc6678791018a9 (diff) | |
| parent | ad9ee36e7be674120cd8c2b9720ba62a8ad6e0ff (diff) | |
| download | servo-cdd5dc17aa8f1c0764180ee25e1a2b86a2c4af81.tar.gz servo-cdd5dc17aa8f1c0764180ee25e1a2b86a2c4af81.zip | |
Auto merge of #25736 - Darkspirit:ossl, r=jdm
Add OpenSSL 1.1.1 build check, Update HSTS Preload list
* This variant also works with cross-compilation. PR should fail in CI on Android at first:
The net crate successfully compiled after switching to OpenSSL 1.1.1 on Android. It seemed openssl.sh doesn't need any changes.(?)
* Updated HSTS preload list and public suffix list.
* Configured OpenSSL [SECLEVEL=2](https://www.openssl.org/docs/man1.1.1/man3/SSL_CTX_set_security_level.html) like [Debian](https://wiki.debian.org/ContinuousIntegration/TriagingTips/openssl-1.1.1) Stable:
> As a result RSA, DSA and DH keys shorter than [2048 bits](https://github.com/cabforum/documents/blob/16a5a9bb78a193266f8d1465de1ee5a1acf5d184/docs/BR.md#6153-subscriber-certificates) and ECC keys shorter than 224 bits are prohibited.
* Although all other crates compile I generally get a `libscript-fe019dd3e0a4e06d.rlib: bad extended name index at 8` error on simpleservo_jniapi, I guess Debian Testing is too new and I just haven't found the right steps so far.
./mach build -d --android
```
= note: /home/darkspirit/github/servo/android-toolchains/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld.gold: error: /home/darkspirit/github/servo/target/android/armv7-linux-androideabi/debug/deps/libscript-fe019dd3e0a4e06d.rlib: bad extended name index at 8
clang: error: linker command failed with exit code 1 (use -v to see invocation)
toolchain: /home/darkspirit/github/servo/android-toolchains/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin
libs dir: /home/darkspirit/github/servo/android-toolchains/ndk/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a
sysroot: /home/darkspirit/github/servo/android-toolchains/ndk/platforms/android-21/arch-arm
targetdir: /home/darkspirit/github/servo/target/android/armv7-linux-androideabi/debug/build/simpleservo_jniapi-26ef18debb5b3630/out/../../..
```
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #25708, fix #25619.
Diffstat (limited to 'python')
| -rw-r--r-- | python/servo/build_commands.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index e6b2cd6722a..6340480b131 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -331,7 +331,7 @@ class MachCommands(CommandBase): android_arch = self.config["android"]["arch"] # Build OpenSSL for android - env["OPENSSL_VERSION"] = "1.0.2k" + env["OPENSSL_VERSION"] = "1.1.1d" make_cmd = ["make"] if jobs is not None: make_cmd += ["-j" + jobs] @@ -580,7 +580,7 @@ class MachCommands(CommandBase): # The Open SSL configuration env.setdefault("OPENSSL_DIR", path.join(target_path, target, "native", "openssl")) - env.setdefault("OPENSSL_VERSION", "1.0.2k") + env.setdefault("OPENSSL_VERSION", "1.1.1d") env.setdefault("OPENSSL_STATIC", "1") # GStreamer configuration |