Skip to content

Commit 3708f15

Browse files
bors[bot]bors[bot]
committed
Merge #180
180: upgrade OpenSSL to 1.0.2o r=jamesmunns a=bgermann
2 parents 850fbd1 + 1accbaf commit 3708f15

File tree

3 files changed

+33
-29
lines changed

3 files changed

+33
-29
lines changed

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
55

66
## [Unreleased]
77

8+
### Changed
9+
10+
- Bump OpenSSL version to 1.0.2o.
11+
812
## [v0.1.14] - 2017-11-22
913

1014
### Added

‎README.md

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -189,44 +189,44 @@ 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.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 | ✓ |
192+
| `aarch64-linux-android` [5] | N/A | 4.9 | 1.0.2o | ✓ | N/A | ✓ |
193+
| `aarch64-unknown-linux-gnu` | 2.19 | 4.8.2 | 1.0.2o | ✓ | 2.8.0 | ✓ |
194+
| `arm-linux-androideabi` [5] | N/A | 4.9 | 1.0.2o | ✓ | N/A | ✓ |
195+
| `arm-unknown-linux-gnueabi` | 2.19 | 4.8.2 | 1.0.2o | ✓ | 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.2m | ✓ | N/A | ✓ |
198-
| `armv7-unknown-linux-gnueabihf` | 2.15 | 4.6.2 | 1.0.2m | ✓ | 2.8.0 | ✓ |
197+
| `armv7-linux-androideabi` [5] | N/A | 4.9 | 1.0.2o | ✓ | N/A | ✓ |
198+
| `armv7-unknown-linux-gnueabihf` | 2.15 | 4.6.2 | 1.0.2o | ✓ | 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-
| `i586-unknown-linux-gnu` | 2.23 | 5.3.1 | 1.0.2m | ✓ | N/A | ✓ |
202-
| `i686-linux-android` [5] | N/A | 4.9 | 1.0.2m | ✓ | N/A | ✓ |
201+
| `i586-unknown-linux-gnu` | 2.23 | 5.3.1 | 1.0.2o | ✓ | N/A | ✓ |
202+
| `i686-linux-android` [5] | N/A | 4.9 | 1.0.2o | ✓ | N/A | ✓ |
203203
| `i686-pc-windows-gnu` | N/A | 6.2.0 | N/A | ✓ | N/A | ✓ |
204-
| `i686-unknown-freebsd` [1] | 10.2 | 5.3.0 | 1.0.2m | | N/A | |
205-
| `i686-unknown-linux-gnu` | 2.15 | 4.6.2 | 1.0.2m | ✓ | N/A | ✓ |
206-
| `i686-unknown-linux-musl` | 1.1.15 | 5.3.1 | 1.0.2m | | N/A | ✓ |
207-
| `mips-unknown-linux-gnu` | 2.23 | 5.3.1 | 1.0.2m | ✓ | 2.8.0 | ✓ |
208-
| `mips64-unknown-linux-gnuabi64` | 2.23 | 5.3.1 | 1.0.2m | ✓ | 2.8.0 | ✓ |
209-
| `mips64el-unknown-linux-gnuabi64` | 2.23 | 5.3.1 | 1.0.2m | ✓ | 2.8.0 | ✓ |
210-
| `mipsel-unknown-linux-gnu` | 2.23 | 5.3.1 | 1.0.2m | ✓ | 2.8.0 | ✓ |
211-
| `powerpc-unknown-linux-gnu` | 2.19 | 4.8.2 | 1.0.2m | ✓ | 2.7.1 | ✓ |
212-
| `powerpc64-unknown-linux-gnu` | 2.19 | 4.8.2 | 1.0.2m | ✓ | 2.7.1 | ✓ |
213-
| `powerpc64le-unknown-linux-gnu` | 2.19 | 4.8.2 | 1.0.2m | ✓ | 2.7.1 | ✓ |
214-
| `s390x-unknown-linux-gnu` | 2.23 | 5.3.1 | 1.0.2m | ✓ | 2.8.0 | |
215-
| `sparc64-unknown-linux-gnu` [2] | 2.23 | 5.3.1 | 1.0.2m | ✓ | 2.8.0 | ✓ |
216-
| `sparcv9-sun-solaris` [1] | 2.11 | 5.3.0 | 1.0.2m | | N/A | |
204+
| `i686-unknown-freebsd` [1] | 10.2 | 5.3.0 | 1.0.2o | | N/A | |
205+
| `i686-unknown-linux-gnu` | 2.15 | 4.6.2 | 1.0.2o | ✓ | N/A | ✓ |
206+
| `i686-unknown-linux-musl` | 1.1.15 | 5.3.1 | 1.0.2o | | N/A | ✓ |
207+
| `mips-unknown-linux-gnu` | 2.23 | 5.3.1 | 1.0.2o | ✓ | 2.8.0 | ✓ |
208+
| `mips64-unknown-linux-gnuabi64` | 2.23 | 5.3.1 | 1.0.2o | ✓ | 2.8.0 | ✓ |
209+
| `mips64el-unknown-linux-gnuabi64` | 2.23 | 5.3.1 | 1.0.2o | ✓ | 2.8.0 | ✓ |
210+
| `mipsel-unknown-linux-gnu` | 2.23 | 5.3.1 | 1.0.2o | ✓ | 2.8.0 | ✓ |
211+
| `powerpc-unknown-linux-gnu` | 2.19 | 4.8.2 | 1.0.2o | ✓ | 2.7.1 | ✓ |
212+
| `powerpc64-unknown-linux-gnu` | 2.19 | 4.8.2 | 1.0.2o | ✓ | 2.7.1 | ✓ |
213+
| `powerpc64le-unknown-linux-gnu` | 2.19 | 4.8.2 | 1.0.2o | ✓ | 2.7.1 | ✓ |
214+
| `s390x-unknown-linux-gnu` | 2.23 | 5.3.1 | 1.0.2o | ✓ | 2.8.0 | |
215+
| `sparc64-unknown-linux-gnu` [2] | 2.23 | 5.3.1 | 1.0.2o | ✓ | 2.8.0 | ✓ |
216+
| `sparcv9-sun-solaris` [1] | 2.11 | 5.3.0 | 1.0.2o | | N/A | |
217217
| `thumbv6m-none-eabi` [3] | 2.2.0 | 5.3.1 | N/A | | N/A | |
218218
| `thumbv7em-none-eabi` [3] | 2.2.0 | 5.3.1 | N/A | | N/A | |
219219
| `thumbv7em-none-eabihf` [3] | 2.2.0 | 5.3.1 | N/A | | N/A | |
220220
| `thumbv7m-none-eabi` [3] | 2.2.0 | 5.3.1 | N/A | | N/A | |
221221
| `wasm32-unknown-emscripten` [4] | 1.1.15 | 1.37.13 | N/A | ✓ | N/A | ✓ |
222-
| `x86_64-linux-android` [5] | N/A | 4.9 | 1.0.2m | ✓ | N/A | ✓ |
222+
| `x86_64-linux-android` [5] | N/A | 4.9 | 1.0.2o | ✓ | N/A | ✓ |
223223
| `x86_64-pc-windows-gnu` | N/A | 6.2.0 | N/A | ✓ | N/A | ✓ |
224-
| `x86_64-sun-solaris` [1] | 2.11 | 5.3.0 | 1.0.2m | | N/A | |
225-
| `x86_64-unknown-dragonfly` [1] [2] | 4.6.0 | 5.3.0 | 1.0.2m | | N/A | ✓ |
226-
| `x86_64-unknown-freebsd` [1] | 10.2 | 5.3.0 | 1.0.2m | | N/A | |
227-
| `x86_64-unknown-linux-gnu` | 2.15 | 4.6.2 | 1.0.2m | ✓ | N/A | ✓ |
228-
| `x86_64-unknown-linux-musl` | 1.1.15 | 5.3.1 | 1.0.2m | | N/A | ✓ |
229-
| `x86_64-unknown-netbsd`[1] | 7.0 | 5.3.0 | 1.0.2m | | N/A | |
224+
| `x86_64-sun-solaris` [1] | 2.11 | 5.3.0 | 1.0.2o | | N/A | |
225+
| `x86_64-unknown-dragonfly` [1] [2] | 4.6.0 | 5.3.0 | 1.0.2o | | N/A | ✓ |
226+
| `x86_64-unknown-freebsd` [1] | 10.2 | 5.3.0 | 1.0.2o | | N/A | |
227+
| `x86_64-unknown-linux-gnu` | 2.15 | 4.6.2 | 1.0.2o | ✓ | N/A | ✓ |
228+
| `x86_64-unknown-linux-musl` | 1.1.15 | 5.3.1 | 1.0.2o | | N/A | ✓ |
229+
| `x86_64-unknown-netbsd`[1] | 7.0 | 5.3.0 | 1.0.2o | | N/A | |
230230

231231
[1] For *BSD and Solaris targets, the libc column indicates the OS release version from
232232
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.2m
4+
local version=1.0.2o
55
local os=$1 \
66
triple=$2
77

0 commit comments

Comments
 (0)