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 /lib | |
| 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
Diffstat (limited to 'lib')
| -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 |
3 files changed, 3 insertions, 3 deletions
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 |