Unverified Commit 2a3f7850 authored by Matthew Brett's avatar Matthew Brett Committed by GitHub
Browse files

Merge pull request #326 from radarhere/openssl

Updated OpenSSL to 1.1.1g
parents a72a17b7 741c8b73
...@@ -59,6 +59,13 @@ matrix: ...@@ -59,6 +59,13 @@ matrix:
- MB_PYTHON_VERSION=2.7 - MB_PYTHON_VERSION=2.7
- MB_PYTHON_OSX_VER=10.6 - MB_PYTHON_OSX_VER=10.6
- TEST_BUILDS=1 - TEST_BUILDS=1
- OPENSSL_ROOT=openssl-1.0.2u
- OPENSSL_HASH=ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16
- os: osx
env:
- MB_PYTHON_VERSION=2.7
- MB_PYTHON_OSX_VER=10.9
- TEST_BUILDS=1
- os: osx - os: osx
env: env:
- MB_PYTHON_VERSION=2.7 - MB_PYTHON_VERSION=2.7
......
...@@ -41,10 +41,10 @@ FLEX_VERSION=${FLEX_VERSION:-2.6.4} ...@@ -41,10 +41,10 @@ FLEX_VERSION=${FLEX_VERSION:-2.6.4}
BISON_VERSION=${BISON_VERSION:-3.0.4} BISON_VERSION=${BISON_VERSION:-3.0.4}
FFTW_VERSION=${FFTW_VERSION:-3.3.7} FFTW_VERSION=${FFTW_VERSION:-3.3.7}
CFITSIO_VERSION=${CFITSIO_VERSION:-3450} CFITSIO_VERSION=${CFITSIO_VERSION:-3450}
OPENSSL_ROOT=openssl-1.0.2u OPENSSL_ROOT=${OPENSSL_ROOT:-openssl-1.1.1g}
# Hash from https://www.openssl.org/source/openssl-1.0.2?.tar.gz.sha256 # Hash from https://www.openssl.org/source/openssl-1.1.1?.tar.gz.sha256
OPENSSL_HASH=ecd0c6ffb493dd06707d38b14bb4d8c2288bb7033735606569d8f90f89669d16 OPENSSL_HASH=${OPENSSL_HASH:-ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46}
OPENSSL_DOWNLOAD_URL=https://www.openssl.org/source OPENSSL_DOWNLOAD_URL=${OPENSSL_DOWNLOAD_URL:-https://www.openssl.org/source}
ARCHIVE_SDIR=${ARCHIVE_DIR:-archives} ARCHIVE_SDIR=${ARCHIVE_DIR:-archives}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment