Skip to content

Commit 2a8ea48

Browse files
homunkulushomunkulus
committed
Auto merge of #144 - japaric:ssl-up, r=japaric
upgrade OpenSSL to 1.0.2m closes #142
2 parents 3de557c + 8088695 commit 2a8ea48

File tree

4 files changed

+44
-41
lines changed

4 files changed

+44
-41
lines changed

‎.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ matrix:
3030
- env: TARGET=aarch64-linux-android CPP=1 STD=1 OPENSSL=0.5.5 RUN=1
3131
- env: TARGET=arm-linux-androideabi CPP=1 STD=1 OPENSSL=0.5.5 RUN=1
3232
- env: TARGET=armv7-linux-androideabi CPP=1 STD=1 OPENSSL=0.5.5 RUN=1
33-
- env: TARGET=i686-linux-android CPP=1 STD=1 OPENSSL=0.5.5 RUN=1
33+
# NOTE RUN=1 missing due to issue #143
34+
- env: TARGET=i686-linux-android CPP=1 STD=1 OPENSSL=0.5.5
3435
- env: TARGET=x86_64-linux-android CPP=1 STD=1 OPENSSL=0.5.5 RUN=1
3536

3637
# OSX
@@ -56,6 +57,8 @@ matrix:
5657
# Emscripten
5758
- env: TARGET=asmjs-unknown-emscripten CPP=1 STD=1 RUN=1
5859
- env: TARGET=wasm32-unknown-emscripten CPP=1 STD=1 RUN=1
60+
# work around rust-lang/cargo#4689
61+
rust: nightly-2017-10-24
5962

6063
# Bare metal
6164
- env: TARGET=thumbv6m-none-eabi RUN=1

‎Cargo.lock

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -189,43 +189,43 @@ worst, "hang" (never terminate).
189189

190190
| Target | libc | GCC | OpenSSL | C++ | QEMU | `test` |
191191
|--------------------------------------|--------|---------|---------|:---:|-------|:------:|
192-
| `aarch64-linux-android` [5] | N/A | 4.9 | 1.0.2k | ✓ | N/A | ✓ |
193-
| `aarch64-unknown-linux-gnu` | 2.19 | 4.8.2 | 1.0.2k | ✓ | 2.8.0 | ✓ |
194-
| `arm-linux-androideabi` [5] | N/A | 4.9 | 1.0.2k | ✓ | N/A | ✓ |
195-
| `arm-unknown-linux-gnueabi` | 2.19 | 4.8.2 | 1.0.2k | ✓ | 2.8.0 | ✓ |
192+
| `aarch64-linux-android` [5] | N/A | 4.9 | 1.0.2m | ✓ | N/A | ✓ |
193+
| `aarch64-unknown-linux-gnu` | 2.19 | 4.8.2 | 1.0.2m | ✓ | 2.8.0 | ✓ |
194+
| `arm-linux-androideabi` [5] | N/A | 4.9 | 1.0.2m | ✓ | N/A | ✓ |
195+
| `arm-unknown-linux-gnueabi` | 2.19 | 4.8.2 | 1.0.2m | ✓ | 2.8.0 | ✓ |
196196
| `arm-unknown-linux-musleabi` | 1.1.15 | 5.3.1 | N/A | | 2.8.0 | ✓ |
197-
| `armv7-linux-androideabi` [5] | N/A | 4.9 | 1.0.2k | ✓ | N/A | ✓ |
198-
| `armv7-unknown-linux-gnueabihf` | 2.15 | 4.6.2 | 1.0.2k | ✓ | 2.8.0 | ✓ |
197+
| `armv7-linux-androideabi` [5] | N/A | 4.9 | 1.0.2m | ✓ | N/A | ✓ |
198+
| `armv7-unknown-linux-gnueabihf` | 2.15 | 4.6.2 | 1.0.2m | ✓ | 2.8.0 | ✓ |
199199
| `armv7-unknown-linux-musleabihf` | 1.1.15 | 5.3.1 | N/A | | 2.8.0 | ✓ |
200200
| `asmjs-unknown-emscripten` [4] | 1.1.15 | 1.37.13 | N/A | ✓ | N/A | ✓ |
201-
| `i686-linux-android` [5] | N/A | 4.9 | 1.0.2k | ✓ | N/A | ✓ |
201+
| `i686-linux-android` [5] | N/A | 4.9 | 1.0.2m | ✓ | N/A | ✓ |
202202
| `i686-pc-windows-gnu` | N/A | 6.2.0 | N/A | ✓ | N/A | ✓ |
203-
| `i686-unknown-freebsd` [1] | 10.2 | 5.3.0 | 1.0.2k | | N/A | |
204-
| `i686-unknown-linux-gnu` | 2.15 | 4.6.2 | 1.0.2k | ✓ | N/A | ✓ |
205-
| `i686-unknown-linux-musl` | 1.1.15 | 5.3.1 | 1.0.2k | | N/A | ✓ |
206-
| `mips-unknown-linux-gnu` | 2.23 | 5.3.1 | 1.0.2k | ✓ | 2.8.0 | ✓ |
207-
| `mips64-unknown-linux-gnuabi64` | 2.23 | 5.3.1 | 1.0.2k | ✓ | 2.8.0 | ✓ |
208-
| `mips64el-unknown-linux-gnuabi64` | 2.23 | 5.3.1 | 1.0.2k | ✓ | 2.8.0 | ✓ |
209-
| `mipsel-unknown-linux-gnu` | 2.23 | 5.3.1 | 1.0.2k | ✓ | 2.8.0 | ✓ |
210-
| `powerpc-unknown-linux-gnu` | 2.19 | 4.8.2 | 1.0.2k | ✓ | 2.7.1 | ✓ |
211-
| `powerpc64-unknown-linux-gnu` | 2.19 | 4.8.2 | 1.0.2k | ✓ | 2.7.1 | ✓ |
212-
| `powerpc64le-unknown-linux-gnu` | 2.19 | 4.8.2 | 1.0.2k | ✓ | 2.7.1 | ✓ |
213-
| `s390x-unknown-linux-gnu` | 2.23 | 5.3.1 | 1.0.2k | ✓ | 2.8.0 | |
214-
| `sparc64-unknown-linux-gnu` [2] | 2.23 | 5.3.1 | 1.0.2k | ✓ | 2.8.0 | ✓ |
215-
| `sparcv9-sun-solaris` [1] | 2.11 | 5.3.0 | 1.0.2k | | N/A | |
203+
| `i686-unknown-freebsd` [1] | 10.2 | 5.3.0 | 1.0.2m | | N/A | |
204+
| `i686-unknown-linux-gnu` | 2.15 | 4.6.2 | 1.0.2m | ✓ | N/A | ✓ |
205+
| `i686-unknown-linux-musl` | 1.1.15 | 5.3.1 | 1.0.2m | | N/A | ✓ |
206+
| `mips-unknown-linux-gnu` | 2.23 | 5.3.1 | 1.0.2m | ✓ | 2.8.0 | ✓ |
207+
| `mips64-unknown-linux-gnuabi64` | 2.23 | 5.3.1 | 1.0.2m | ✓ | 2.8.0 | ✓ |
208+
| `mips64el-unknown-linux-gnuabi64` | 2.23 | 5.3.1 | 1.0.2m | ✓ | 2.8.0 | ✓ |
209+
| `mipsel-unknown-linux-gnu` | 2.23 | 5.3.1 | 1.0.2m | ✓ | 2.8.0 | ✓ |
210+
| `powerpc-unknown-linux-gnu` | 2.19 | 4.8.2 | 1.0.2m | ✓ | 2.7.1 | ✓ |
211+
| `powerpc64-unknown-linux-gnu` | 2.19 | 4.8.2 | 1.0.2m | ✓ | 2.7.1 | ✓ |
212+
| `powerpc64le-unknown-linux-gnu` | 2.19 | 4.8.2 | 1.0.2m | ✓ | 2.7.1 | ✓ |
213+
| `s390x-unknown-linux-gnu` | 2.23 | 5.3.1 | 1.0.2m | ✓ | 2.8.0 | |
214+
| `sparc64-unknown-linux-gnu` [2] | 2.23 | 5.3.1 | 1.0.2m | ✓ | 2.8.0 | ✓ |
215+
| `sparcv9-sun-solaris` [1] | 2.11 | 5.3.0 | 1.0.2m | | N/A | |
216216
| `thumbv6m-none-eabi` [3] | 2.2.0 | 5.3.1 | N/A | | N/A | |
217217
| `thumbv7em-none-eabi` [3] | 2.2.0 | 5.3.1 | N/A | | N/A | |
218218
| `thumbv7em-none-eabihf` [3] | 2.2.0 | 5.3.1 | N/A | | N/A | |
219219
| `thumbv7m-none-eabi` [3] | 2.2.0 | 5.3.1 | N/A | | N/A | |
220220
| `wasm32-unknown-emscripten` [4] | 1.1.15 | 1.37.13 | N/A | ✓ | N/A | ✓ |
221-
| `x86_64-linux-android` [5] | N/A | 4.9 | 1.0.2k | ✓ | N/A | ✓ |
221+
| `x86_64-linux-android` [5] | N/A | 4.9 | 1.0.2m | ✓ | N/A | ✓ |
222222
| `x86_64-pc-windows-gnu` | N/A | 6.2.0 | N/A | ✓ | N/A | ✓ |
223-
| `x86_64-sun-solaris` [1] | 2.11 | 5.3.0 | 1.0.2k | | N/A | |
224-
| `x86_64-unknown-dragonfly` [1] [2] | 4.6.0 | 5.3.0 | 1.0.2k | | N/A | ✓ |
225-
| `x86_64-unknown-freebsd` [1] | 10.2 | 5.3.0 | 1.0.2k | | N/A | |
226-
| `x86_64-unknown-linux-gnu` | 2.15 | 4.6.2 | 1.0.2k | ✓ | N/A | ✓ |
227-
| `x86_64-unknown-linux-musl` | 1.1.15 | 5.3.1 | 1.0.2k | | N/A | ✓ |
228-
| `x86_64-unknown-netbsd`[1] | 7.0 | 5.3.0 | 1.0.2k | | N/A | |
223+
| `x86_64-sun-solaris` [1] | 2.11 | 5.3.0 | 1.0.2m | | N/A | |
224+
| `x86_64-unknown-dragonfly` [1] [2] | 4.6.0 | 5.3.0 | 1.0.2m | | N/A | ✓ |
225+
| `x86_64-unknown-freebsd` [1] | 10.2 | 5.3.0 | 1.0.2m | | N/A | |
226+
| `x86_64-unknown-linux-gnu` | 2.15 | 4.6.2 | 1.0.2m | ✓ | N/A | ✓ |
227+
| `x86_64-unknown-linux-musl` | 1.1.15 | 5.3.1 | 1.0.2m | | N/A | ✓ |
228+
| `x86_64-unknown-netbsd`[1] | 7.0 | 5.3.0 | 1.0.2m | | N/A | |
229229

230230
[1] For *BSD and Solaris targets, the libc column indicates the OS release version from
231231
where libc was extracted.

‎docker/openssl.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
set -ex
22

33
main() {
4-
local version=1.0.2k
4+
local version=1.0.2m
55
local os=$1 \
66
triple=$2
77

0 commit comments

Comments
 (0)