mirror of
https://github.com/gravitational/teleport
synced 2024-10-19 16:53:57 +00:00
Bump OpenSSL to 1.1.1s (#18009)
Bump OpenSSL from 1.1.1r to 1.1.1s, which fixes a regression in 1.1.1r. Fixed an improper array expansion in build-fido2-macos.sh as well. Release notes: https://github.com/openssl/openssl/blob/OpenSSL_1_1_1s/CHANGES.
This commit is contained in:
parent
a0259fd495
commit
ba54636f9e
|
@ -27,9 +27,9 @@ RUN git clone --depth=1 https://github.com/illiliti/libudev-zero.git -b 1.0.1 &&
|
|||
# Instal openssl.
|
||||
# Pulled from source because repository versions are too old.
|
||||
# install_sw install only binaries, skips docs.
|
||||
RUN git clone --depth=1 https://github.com/openssl/openssl.git -b OpenSSL_1_1_1r && \
|
||||
RUN git clone --depth=1 https://github.com/openssl/openssl.git -b OpenSSL_1_1_1s && \
|
||||
cd openssl && \
|
||||
[ "$(git rev-parse HEAD)" = "fbda8a9e3b6266da377a6f57d597d657257d9cff" ] && \
|
||||
[ "$(git rev-parse HEAD)" = "129058165d195e43a0ad10111b0c2e29bdf65980" ] && \
|
||||
./config --release && \
|
||||
make && \
|
||||
make install_sw
|
||||
|
|
|
@ -16,8 +16,8 @@ readonly MACOS_VERSION_MIN=10.13
|
|||
# Note: versions are the same as the corresponding git tags for each repo.
|
||||
readonly CBOR_VERSION=v0.9.0
|
||||
readonly CBOR_COMMIT=58b3319b8c3ec15171cb00f01a3a1e9d400899e1
|
||||
readonly CRYPTO_VERSION=OpenSSL_1_1_1r
|
||||
readonly CRYPTO_COMMIT=fbda8a9e3b6266da377a6f57d597d657257d9cff
|
||||
readonly CRYPTO_VERSION=OpenSSL_1_1_1s
|
||||
readonly CRYPTO_COMMIT=129058165d195e43a0ad10111b0c2e29bdf65980
|
||||
readonly FIDO2_VERSION=1.12.0
|
||||
readonly FIDO2_COMMIT=659a02679f99fd34a44e06e35dce90794f6ecc86
|
||||
|
||||
|
@ -226,7 +226,11 @@ EOF
|
|||
}
|
||||
|
||||
cleanup() {
|
||||
for path in "${CLEANUPS[@]}"; do
|
||||
# The strange looking expansion below (`${arr[@]+"${arr[@]}"}`) avoids unbound
|
||||
# errors when the array is empty. (The actual expansion is quoted.)
|
||||
# See https://stackoverflow.com/a/7577209.
|
||||
#shellcheck disable=SC2068
|
||||
for path in ${CLEANUPS[@]+"${CLEANUPS[@]}"}; do
|
||||
echo "Removing: $path" >&2
|
||||
rm -fr "$path"
|
||||
done
|
||||
|
|
Loading…
Reference in a new issue