diff options
author | Robert Relyea <rrelyea@redhat.com> | 2022-11-30 10:52:12 -0800 |
---|---|---|
committer | Robert Relyea <rrelyea@redhat.com> | 2022-11-30 10:52:12 -0800 |
commit | f64f571088d44007d565c0499f462ae005f63e30 (patch) | |
tree | a00ca55008ead2c337d54f09f115586e045f5a55 | |
parent | 149ef874d2fa51c88524a6b87b8ded3e658a900d (diff) | |
download | nss-hg-f64f571088d44007d565c0499f462ae005f63e30.tar.gz |
Bug 1803190 conscious language removal in NSS
Clean up problemantic terms are master, slave, whitelist, blacklist.
These are usually easily changes to main/server, client, allowlist, and blocklist (or other similiar terms, which are often more descriptive anyway). Things related to the tls/ssl master key, which part of the tls spec and needs to first be handled by the tls ietf working group.
Differential Revision: https://phabricator.services.mozilla.com/D163522
-rwxr-xr-x | automation/clang-format/run_clang_format.sh | 8 | ||||
-rwxr-xr-x | automation/taskcluster/scripts/check_abi.sh | 8 | ||||
-rwxr-xr-x | lib/libpkix/include/pkix_errorstrings.h | 2 | ||||
-rwxr-xr-x | lib/libpkix/pkix/top/pkix_build.c | 2 | ||||
-rw-r--r-- | lib/pk11wrap/pk11auth.c | 2 | ||||
-rwxr-xr-x | tests/mksymlinks | 22 |
6 files changed, 11 insertions, 33 deletions
diff --git a/automation/clang-format/run_clang_format.sh b/automation/clang-format/run_clang_format.sh index 50d4eead7..9f2b20db6 100755 --- a/automation/clang-format/run_clang_format.sh +++ b/automation/clang-format/run_clang_format.sh @@ -13,7 +13,7 @@ set -e # Any differences between formatted and unformatted files is printed to stdout to give a hint what's wrong. # Includes a default set of directories NOT to clang-format on. -blacklist=( +blocklist=( "./automation" \ "./coreconf" \ "./doc" \ @@ -37,8 +37,8 @@ fi format_folder() { - for black in "${blacklist[@]}"; do - if [[ "$1" == "$black"* ]]; then + for block in "${blocklist[@]}"; do + if [[ "$1" == "$block"* ]]; then echo "skip $1" return 1 fi @@ -65,4 +65,4 @@ if [[ -d "$top/.hg" ]]; then else git -C "$top" diff | tee $TMPFILE fi -[[ ! -s $TMPFILE ]]
\ No newline at end of file +[[ ! -s $TMPFILE ]] diff --git a/automation/taskcluster/scripts/check_abi.sh b/automation/taskcluster/scripts/check_abi.sh index da610955f..0bd8d9693 100755 --- a/automation/taskcluster/scripts/check_abi.sh +++ b/automation/taskcluster/scripts/check_abi.sh @@ -89,7 +89,7 @@ check_abi() abi_diff } -#Slightly modified from builbot-slave/build.sh +#Slightly modified from build.sh in this directory abi_diff() { ABI_PROBLEM_FOUND=0 @@ -123,7 +123,7 @@ abi_diff() # If abidiff reports an error, or a usage error, or if it sets a result # bit value this script doesn't know yet about, we'll report failure. # For ABI changes, we don't yet report an error. We'll compare the - # result report with our whitelist. This allows us to silence changes + # result report with our allowlist. This allows us to silence changes # that we're already aware of and have been declared acceptable. REPORT_RET_AS_FAILURE=0 @@ -141,10 +141,10 @@ abi_diff() fi if [ $ABIDIFF_ABI_CHANGE -ne 0 ]; then - echo "Ignoring abidiff result ABI_CHANGE, instead we'll check for non-whitelisted differences." + echo "Ignoring abidiff result ABI_CHANGE, instead we'll check for non-allowlisted differences." fi if [ $ABIDIFF_ABI_INCOMPATIBLE_CHANGE -ne 0 ]; then - echo "Ignoring abidiff result ABIDIFF_ABI_INCOMPATIBLE_CHANGE, instead we'll check for non-whitelisted differences." + echo "Ignoring abidiff result ABIDIFF_ABI_INCOMPATIBLE_CHANGE, instead we'll check for non-allowlisted differences." fi if [ $REPORT_RET_AS_FAILURE -ne 0 ]; then diff --git a/lib/libpkix/include/pkix_errorstrings.h b/lib/libpkix/include/pkix_errorstrings.h index e7e898f60..0519bff0e 100755 --- a/lib/libpkix/include/pkix_errorstrings.h +++ b/lib/libpkix/include/pkix_errorstrings.h @@ -1096,4 +1096,4 @@ PKIX_ERRORENTRY(X500NAMETOSTRINGFAILED,PKIX_PL_X500Name_ToString failed,0), PKIX_ERRORENTRY(ZEROLENGTHBYTEARRAYFORCRLENCODING,Zero-length ByteArray for CRL encoding,0), PKIX_ERRORENTRY(INVALIDOCSPHTTPMETHOD,Unsupported HTTP Method for OCSP retrieval,0), PKIX_ERRORENTRY(OCSPGETREQUESTTOOBIG,OCSP request too big for HTTP GET method,0), -PKIX_ERRORENTRY(CERTISBLACKLISTEDATISSUANCETIME,Issuer Certificate is distrusted at the time the subordinate certifiate was issued,SEC_ERROR_UNTRUSTED_ISSUER) +PKIX_ERRORENTRY(CERTISBLOCKLISTEDATISSUANCETIME,Issuer Certificate is distrusted at the time the subordinate certifiate was issued,SEC_ERROR_UNTRUSTED_ISSUER) diff --git a/lib/libpkix/pkix/top/pkix_build.c b/lib/libpkix/pkix/top/pkix_build.c index 0c87ba3f3..aebfeebad 100755 --- a/lib/libpkix/pkix/top/pkix_build.c +++ b/lib/libpkix/pkix/top/pkix_build.c @@ -2363,7 +2363,7 @@ pkix_BuildForwardDepthFirstSearch( if (isIssuerCertAllowedAtCertIssuanceTime( state->candidateCert->nssCert, targetCert->nssCert) != SECSuccess) { - PKIX_ERROR(PKIX_CERTISBLACKLISTEDATISSUANCETIME); + PKIX_ERROR(PKIX_CERTISBLOCKLISTEDATISSUANCETIME); } if ((state->verifyNode) != NULL) { diff --git a/lib/pk11wrap/pk11auth.c b/lib/pk11wrap/pk11auth.c index 42e64e1c9..e3132e54a 100644 --- a/lib/pk11wrap/pk11auth.c +++ b/lib/pk11wrap/pk11auth.c @@ -575,7 +575,7 @@ PK11_DoPassword(PK11SlotInfo *slot, CK_SESSION_HANDLE session, /* * Central server type applications which control access to multiple - * slave applications to single crypto devices need to virtuallize the + * client applications to single crypto devices need to virtuallize the * login state. This is done by a callback out of PK11_IsLoggedIn and * here. If we are actually logged in, then we got here because the * higher level code told us that the particular client application may diff --git a/tests/mksymlinks b/tests/mksymlinks index d592f789b..f82270c87 100755 --- a/tests/mksymlinks +++ b/tests/mksymlinks @@ -66,28 +66,6 @@ fi if [ ! -h SunOS5.9_OPT.OBJ -a ! -d SunOS5.9_OPT.OBJ ] ; then ln -s SunOS5.8_OPT.OBJ SunOS5.9_OPT.OBJ || ErrorFlag=1 fi -#sonmi - still leaving the section in there so 3.3 and 3.2 will not break -#since 5.8 is the masterbuild it should never be executed -#additionally: only creat link if the slave build is present, but -#master is not -#if [ ! -h SunOS5.8_DBG.OBJ -a ! -d SunOS5.8_DBG.OBJ ] ; then - #if [ -d SunOS5.6_DBG.OBJ ] ; then - #ln -s SunOS5.6_DBG.OBJ SunOS5.8_DBG.OBJ || ErrorFlag=1 - #fi -#fi -#if [ ! -h SunOS5.8_OPT.OBJ -a ! -d SunOS5.8_OPT.OBJ ] ; then - #if [ -d SunOS5.6_OPT.OBJ ] ; then - #ln -s SunOS5.6_OPT.OBJ SunOS5.8_OPT.OBJ || ErrorFlag=1 - #fi -#fi -#if [ ! -h Linux2.4_x86_glibc_PTH_DBG.OBJ -a ! -d Linux2.4_x86_glibc_PTH_DBG.OBJ] -#then - #ln -s Linux2.2_x86_glibc_PTH_DBG.OBJ Linux2.4_x86_glibc_PTH_DBG.OBJ || ErrorFlag=1 -#fi -#if [ ! -h Linux2.4_x86_glibc_PTH_OPT.OBJ -a ! -d Linux2.4_x86_glibc_PTH_OPT.OBJ] -#then - #ln -s Linux2.2_x86_glibc_PTH_OPT.OBJ Linux2.4_x86_glibc_PTH_OPT.OBJ || ErrorFlag=1 -#fi if [ ! -h SunOS5.9_i86pc_DBG.OBJ -a ! -d SunOS5.9_i86pc_DBG.OBJ ] ; then ln -s SunOS5.8_i86pc_DBG.OBJ SunOS5.9_i86pc_DBG.OBJ || ErrorFlag=1 |