diff --git a/_dl.sh b/_dl.sh index 8b4340dbd..da7acc875 100755 --- a/_dl.sh +++ b/_dl.sh @@ -108,11 +108,11 @@ cat <&2 echo "! ${name}: Verify: Failed (Signature expected, but missing)" elif grep -a -q -F 'BEGIN SSH SIGNATURE' pkg.sig; then - [[ "${key}" = 'https://'* ]] && key="$(my_curl --max-time 60 "${key}")" + [[ "${key}" = 'https://'* ]] && key="$(my_curl "${key}")" exec 3</dev/null 2>&1 + if [[ "${key}" = 'https://'* ]]; then + my_curl "${key}" | my_gpg --quiet --import >/dev/null 2>&1 + else + gpg_recv_key "${key}" >/dev/null 2>&1 + fi done if my_gpg --verify-options show-primary-uid-only --verify pkg.sig pkg.bin >/dev/null 2>&1; then @@ -613,14 +617,18 @@ live_dl() { >&2 echo "! ${name}: Verify: Failed (Signature expected, but missing)" exit 1 elif grep -a -q -F 'BEGIN SSH SIGNATURE' pkg.sig; then - [[ "${key}" = 'https://'* ]] && key="$(my_curl --max-time 60 "${key}")" + [[ "${key}" = 'https://'* ]] && key="$(my_curl "${key}")" exec 3</dev/null + else + gpg_recv_key "${key}" + fi done my_gpg --verify-options show-primary-uid-only --verify pkg.sig pkg.bin || exit 1 fi diff --git a/_versions.sh b/_versions.sh index 04f89b0ba..2c7667f9d 100755 --- a/_versions.sh +++ b/_versions.sh @@ -39,7 +39,7 @@ export NGHTTP2_HASH=625d6c3da1d9ca4fd643a638256431ae68fd1901653b2a61a245eea7b261 export NGHTTP3_VER_='1.2.0' export NGHTTP3_HASH=d2e216bae7bd7362f850922e4237a5caa204853b3594b22adccab4c1e1c1d1aa export NGTCP2_VER_='1.4.0' -export NGTCP2_HASH=70b647144fe258c18763a87130750d0b5ec61ba5cb9a2cd2eb6eef70108594c3 +export NGTCP2_HASH=b5d1433b9f5c06ce249e1e390e97dcfa49bf7ada5cb7c8bed8e6cd4feaf1ca4a export WOLFSSL_VER_='5.6.6' export WOLFSSL_HASH=3d2ca672d41c2c2fa667885a80d6fa03c3e91f0f4f72f87aef2bc947e8c87237 export MBEDTLS_VER_='3.5.2'