Skip to content

Commit

Permalink
Auto merge of #142 - :master, r=japaric
Browse files Browse the repository at this point in the history 
Update OpenSSL to version 1.0.2l
  • Loading branch information
@homunkulus
homunkulus committed Nov 4, 2017
2 parents 3de557c + 9c9bca6 commit c184a8b
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 28 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ matrix:
# Emscripten
- env: TARGET=asmjs-unknown-emscripten CPP=1 STD=1 RUN=1
- env: TARGET=wasm32-unknown-emscripten CPP=1 STD=1 RUN=1
# work around rust-lang/cargo#4689
rust: nightly-2017-10-24


# Bare metal
- env: TARGET=thumbv6m-none-eabi RUN=1
Expand Down
54 changes: 27 additions & 27 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,43 +189,43 @@ worst, "hang" (never terminate).

| Target | libc | GCC | OpenSSL | C++ | QEMU | `test` |
|--------------------------------------|--------|---------|---------|:---:|-------|:------:|
| `aarch64-linux-android` [5] | N/A | 4.9 | 1.0.2k | ✓ | N/A | ✓ |
| `aarch64-unknown-linux-gnu` | 2.19 | 4.8.2 | 1.0.2k | ✓ | 2.8.0 | ✓ |
| `arm-linux-androideabi` [5] | N/A | 4.9 | 1.0.2k | ✓ | N/A | ✓ |
| `arm-unknown-linux-gnueabi` | 2.19 | 4.8.2 | 1.0.2k | ✓ | 2.8.0 | ✓ |
| `aarch64-linux-android` [5] | N/A | 4.9 | 1.0.2l | ✓ | N/A | ✓ |
| `aarch64-unknown-linux-gnu` | 2.19 | 4.8.2 | 1.0.2l | ✓ | 2.8.0 | ✓ |
| `arm-linux-androideabi` [5] | N/A | 4.9 | 1.0.2l | ✓ | N/A | ✓ |
| `arm-unknown-linux-gnueabi` | 2.19 | 4.8.2 | 1.0.2l | ✓ | 2.8.0 | ✓ |
| `arm-unknown-linux-musleabi` | 1.1.15 | 5.3.1 | N/A | | 2.8.0 | ✓ |
| `armv7-linux-androideabi` [5] | N/A | 4.9 | 1.0.2k | ✓ | N/A | ✓ |
| `armv7-unknown-linux-gnueabihf` | 2.15 | 4.6.2 | 1.0.2k | ✓ | 2.8.0 | ✓ |
| `armv7-linux-androideabi` [5] | N/A | 4.9 | 1.0.2l | ✓ | N/A | ✓ |
| `armv7-unknown-linux-gnueabihf` | 2.15 | 4.6.2 | 1.0.2l | ✓ | 2.8.0 | ✓ |
| `armv7-unknown-linux-musleabihf` | 1.1.15 | 5.3.1 | N/A | | 2.8.0 | ✓ |
| `asmjs-unknown-emscripten` [4] | 1.1.15 | 1.37.13 | N/A | ✓ | N/A | ✓ |
| `i686-linux-android` [5] | N/A | 4.9 | 1.0.2k | ✓ | N/A | ✓ |
| `i686-linux-android` [5] | N/A | 4.9 | 1.0.2l | ✓ | N/A | ✓ |
| `i686-pc-windows-gnu` | N/A | 6.2.0 | N/A | ✓ | N/A | ✓ |
| `i686-unknown-freebsd` [1] | 10.2 | 5.3.0 | 1.0.2k | | N/A | |
| `i686-unknown-linux-gnu` | 2.15 | 4.6.2 | 1.0.2k | ✓ | N/A | ✓ |
| `i686-unknown-linux-musl` | 1.1.15 | 5.3.1 | 1.0.2k | | N/A | ✓ |
| `mips-unknown-linux-gnu` | 2.23 | 5.3.1 | 1.0.2k | ✓ | 2.8.0 | ✓ |
| `mips64-unknown-linux-gnuabi64` | 2.23 | 5.3.1 | 1.0.2k | ✓ | 2.8.0 | ✓ |
| `mips64el-unknown-linux-gnuabi64` | 2.23 | 5.3.1 | 1.0.2k | ✓ | 2.8.0 | ✓ |
| `mipsel-unknown-linux-gnu` | 2.23 | 5.3.1 | 1.0.2k | ✓ | 2.8.0 | ✓ |
| `powerpc-unknown-linux-gnu` | 2.19 | 4.8.2 | 1.0.2k | ✓ | 2.7.1 | ✓ |
| `powerpc64-unknown-linux-gnu` | 2.19 | 4.8.2 | 1.0.2k | ✓ | 2.7.1 | ✓ |
| `powerpc64le-unknown-linux-gnu` | 2.19 | 4.8.2 | 1.0.2k | ✓ | 2.7.1 | ✓ |
| `s390x-unknown-linux-gnu` | 2.23 | 5.3.1 | 1.0.2k | ✓ | 2.8.0 | |
| `sparc64-unknown-linux-gnu` [2] | 2.23 | 5.3.1 | 1.0.2k | ✓ | 2.8.0 | ✓ |
| `sparcv9-sun-solaris` [1] | 2.11 | 5.3.0 | 1.0.2k | | N/A | |
| `i686-unknown-freebsd` [1] | 10.2 | 5.3.0 | 1.0.2l | | N/A | |
| `i686-unknown-linux-gnu` | 2.15 | 4.6.2 | 1.0.2l | ✓ | N/A | ✓ |
| `i686-unknown-linux-musl` | 1.1.15 | 5.3.1 | 1.0.2l | | N/A | ✓ |
| `mips-unknown-linux-gnu` | 2.23 | 5.3.1 | 1.0.2l | ✓ | 2.8.0 | ✓ |
| `mips64-unknown-linux-gnuabi64` | 2.23 | 5.3.1 | 1.0.2l | ✓ | 2.8.0 | ✓ |
| `mips64el-unknown-linux-gnuabi64` | 2.23 | 5.3.1 | 1.0.2l | ✓ | 2.8.0 | ✓ |
| `mipsel-unknown-linux-gnu` | 2.23 | 5.3.1 | 1.0.2l | ✓ | 2.8.0 | ✓ |
| `powerpc-unknown-linux-gnu` | 2.19 | 4.8.2 | 1.0.2l | ✓ | 2.7.1 | ✓ |
| `powerpc64-unknown-linux-gnu` | 2.19 | 4.8.2 | 1.0.2l | ✓ | 2.7.1 | ✓ |
| `powerpc64le-unknown-linux-gnu` | 2.19 | 4.8.2 | 1.0.2l | ✓ | 2.7.1 | ✓ |
| `s390x-unknown-linux-gnu` | 2.23 | 5.3.1 | 1.0.2l | ✓ | 2.8.0 | |
| `sparc64-unknown-linux-gnu` [2] | 2.23 | 5.3.1 | 1.0.2l | ✓ | 2.8.0 | ✓ |
| `sparcv9-sun-solaris` [1] | 2.11 | 5.3.0 | 1.0.2l | | N/A | |
| `thumbv6m-none-eabi` [3] | 2.2.0 | 5.3.1 | N/A | | N/A | |
| `thumbv7em-none-eabi` [3] | 2.2.0 | 5.3.1 | N/A | | N/A | |
| `thumbv7em-none-eabihf` [3] | 2.2.0 | 5.3.1 | N/A | | N/A | |
| `thumbv7m-none-eabi` [3] | 2.2.0 | 5.3.1 | N/A | | N/A | |
| `wasm32-unknown-emscripten` [4] | 1.1.15 | 1.37.13 | N/A | ✓ | N/A | ✓ |
| `x86_64-linux-android` [5] | N/A | 4.9 | 1.0.2k | ✓ | N/A | ✓ |
| `x86_64-linux-android` [5] | N/A | 4.9 | 1.0.2l | ✓ | N/A | ✓ |
| `x86_64-pc-windows-gnu` | N/A | 6.2.0 | N/A | ✓ | N/A | ✓ |
| `x86_64-sun-solaris` [1] | 2.11 | 5.3.0 | 1.0.2k | | N/A | |
| `x86_64-unknown-dragonfly` [1] [2] | 4.6.0 | 5.3.0 | 1.0.2k | | N/A | ✓ |
| `x86_64-unknown-freebsd` [1] | 10.2 | 5.3.0 | 1.0.2k | | N/A | |
| `x86_64-unknown-linux-gnu` | 2.15 | 4.6.2 | 1.0.2k | ✓ | N/A | ✓ |
| `x86_64-unknown-linux-musl` | 1.1.15 | 5.3.1 | 1.0.2k | | N/A | ✓ |
| `x86_64-unknown-netbsd`[1] | 7.0 | 5.3.0 | 1.0.2k | | N/A | |
| `x86_64-sun-solaris` [1] | 2.11 | 5.3.0 | 1.0.2l | | N/A | |
| `x86_64-unknown-dragonfly` [1] [2] | 4.6.0 | 5.3.0 | 1.0.2l | | N/A | ✓ |
| `x86_64-unknown-freebsd` [1] | 10.2 | 5.3.0 | 1.0.2l | | N/A | |
| `x86_64-unknown-linux-gnu` | 2.15 | 4.6.2 | 1.0.2l | ✓ | N/A | ✓ |
| `x86_64-unknown-linux-musl` | 1.1.15 | 5.3.1 | 1.0.2l | | N/A | ✓ |
| `x86_64-unknown-netbsd`[1] | 7.0 | 5.3.0 | 1.0.2l | | N/A | |

[1] For *BSD and Solaris targets, the libc column indicates the OS release version from
where libc was extracted.
Expand Down
2 changes: 1 addition & 1 deletion docker/openssl.sh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
set -ex

main() {
local version=1.0.2k
local version=1.0.2l
local os=$1 \
triple=$2

Expand Down

0 comments on commit c184a8b

Please sign in to comment.