Skip to content

Update NSS to 3.119 #7117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
rvandermeulen wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −15
Draft

Update NSS to 3.119 #7117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions libs/build-all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.119"
NSS_ARCHIVE="nss-3.119-with-nspr-4.38.2.tar.gz"
NSS_URL="https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_119_RTM/src/${NSS_ARCHIVE}"
NSS_SHA256="8f12f61ef814662bf991a289bc6724d078cd79f135e09e260adbc35dfa9acaf3"

# End of configuration.

Expand Down
13 changes: 5 additions & 8 deletions libs/build-nss-desktop.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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="ad2b32a216718c3dd530dce2afe20d916cb33ca691537d673ce1d3682a5615ae"
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")
Expand Down Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions taskcluster/kinds/fetch/kind.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/IC4_9Xw5RAaCHdCDKJzibQ/runs/0/artifacts/public/dist.tar.bz2
sha256: ad2b32a216718c3dd530dce2afe20d916cb33ca691537d673ce1d3682a5615ae
size: 24983344