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

2 files changed, 8 insertions, 8 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