diff --git a/libs/build-all.sh b/libs/build-all.sh index 14a1f37238..520dbb6322 100755 --- a/libs/build-all.sh +++ b/libs/build-all.sh @@ -2,10 +2,10 @@ set -euvx -NSS="nss-3.118.1" -NSS_ARCHIVE="nss-3.118.1-with-nspr-4.37.tar.gz" -NSS_URL="https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_118_1_RTM/src/${NSS_ARCHIVE}" -NSS_SHA256="9e1f7da9f4e5e3bdfd73f7dc2c618d6125a12354aadaeedbb35af3699bc03e15" +NSS="nss-3.120" +NSS_ARCHIVE="nss-3.120-with-nspr-4.38.2.tar.gz" +NSS_URL="https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_120_RTM/src/${NSS_ARCHIVE}" +NSS_SHA256="fb5aa56fa35d963d4c65278328e2e9c99c2484c86f0e41537412477739dcf997" # End of configuration. diff --git a/libs/build-nss-desktop.sh b/libs/build-nss-desktop.sh index bfdb7849fd..81f5eb4565 100755 --- a/libs/build-nss-desktop.sh +++ b/libs/build-nss-desktop.sh @@ -63,7 +63,7 @@ if [[ "${CROSS_COMPILE_TARGET}" =~ "darwin" ]]; then else # From https://firefox-ci-tc.services.mozilla.com/tasks/index/app-services.cache.level-3.content.v1.nss-artifact/latest curl -sfSL --retry 5 --retry-delay 10 -O "https://firefox-ci-tc.services.mozilla.com/api/index/v1/task/app-services.cache.level-3.content.v1.nss-artifact.latest/artifacts/public%2Fdist.tar.bz2" - SHA256="4cf4c0b4a832ef1804adb59c7d4e6023eaf41e1110619e17836721ccde51a5ef" + SHA256="7468906d4dfadc449b5665f7fd3eeada1929fd6fab51ea75efb50b3c355f7a8a" echo "${SHA256} dist.tar.bz2" | shasum -a 256 -c - || exit 2 tar xvjf dist.tar.bz2 && rm -rf dist.tar.bz2 NSS_DIST_DIR=$(abspath "dist") @@ -116,15 +116,12 @@ else cp -p -L "${NSS_DIST_OBJ_DIR}/lib/libhw-acc-crypto-avx.a" "${DIST_DIR}/lib" cp -p -L "${NSS_DIST_OBJ_DIR}/lib/libhw-acc-crypto-avx2.a" "${DIST_DIR}/lib" cp -p -L "${NSS_DIST_OBJ_DIR}/lib/libgcm-aes-x86_c_lib.a" "${DIST_DIR}/lib" + cp -p -L "${NSS_DIST_OBJ_DIR}/lib/libintel-gcm-wrap_c_lib.a" "${DIST_DIR}/lib" cp -p -L "${NSS_DIST_OBJ_DIR}/lib/libsha-x86_c_lib.a" "${DIST_DIR}/lib" fi -# https://searchfox.org/mozilla-central/rev/1eb05019f47069172ba81a6c108a584a409a24ea/security/nss/lib/freebl/freebl.gyp#224-233 -if [[ "${TARGET_OS}" == "windows" ]] || [[ "${TARGET_OS}" == "linux" ]]; then - cp -p -L "${NSS_DIST_OBJ_DIR}/lib/libintel-gcm-wrap_c_lib.a" "${DIST_DIR}/lib" - # https://searchfox.org/mozilla-central/rev/1eb05019f47069172ba81a6c108a584a409a24ea/security/nss/lib/freebl/freebl.gyp#43-47 - if [[ "${TARGET_OS}" == "linux" ]]; then - cp -p -L "${NSS_DIST_OBJ_DIR}/lib/libintel-gcm-s_lib.a" "${DIST_DIR}/lib" - fi +# https://searchfox.org/mozilla-central/rev/1eb05019f47069172ba81a6c108a584a409a24ea/security/nss/lib/freebl/freebl.gyp#43-47 +if [[ "${TARGET_OS}" == "linux" ]]; then + cp -p -L "${NSS_DIST_OBJ_DIR}/lib/libintel-gcm-s_lib.a" "${DIST_DIR}/lib" fi cp -p -L -R "${NSS_DIST_DIR}/public/nss/"* "${DIST_DIR}/include/nss" diff --git a/taskcluster/kinds/fetch/kind.yml b/taskcluster/kinds/fetch/kind.yml index ac8500c88e..91909c947c 100644 --- a/taskcluster/kinds/fetch/kind.yml +++ b/taskcluster/kinds/fetch/kind.yml @@ -17,6 +17,6 @@ tasks: description: fetches the built NSS artifacts from NSS CI fetch: type: static-url - url: https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/Vylko5heTLSBzmM9bRvBwQ/runs/0/artifacts/public/dist.tar.bz2 - sha256: 4cf4c0b4a832ef1804adb59c7d4e6023eaf41e1110619e17836721ccde51a5ef - size: 24915793 + url: https://firefox-ci-tc.services.mozilla.com/api/queue/v1/task/EGodFlPjRGSveSgW_x9X_g/runs/0/artifacts/public/dist.tar.bz2 + sha256: 7468906d4dfadc449b5665f7fd3eeada1929fd6fab51ea75efb50b3c355f7a8a + size: 24973047