Bug 1549818 - Removes expired FIPS_ENABLED telemetry probe r=keeler
authorMoritz Birghan <mbirghan@mozilla.com>
Wed, 24 Jul 2019 19:59:27 +0000
changeset 484111 a6f23b79993d64e186a235b912ca102255fa93fe
parent 484110 295ef3d15d1144e6b3dd18c1ced5a57adfa742ee
child 484112 a1e819139c35bc9e39367f59ddd830c2b3f81745
push id90820
push userdkeeler@mozilla.com
push dateWed, 24 Jul 2019 20:05:06 +0000
treeherderautoland@a6f23b79993d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskeeler
bugs1549818
milestone70.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1549818 - Removes expired FIPS_ENABLED telemetry probe r=keeler Differential Revision: https://phabricator.services.mozilla.com/D39027
security/manager/ssl/PKCS11ModuleDB.cpp
security/manager/ssl/nsNSSComponent.cpp
toolkit/components/telemetry/Histograms.json
toolkit/components/telemetry/histogram-whitelists.json
--- a/security/manager/ssl/PKCS11ModuleDB.cpp
+++ b/security/manager/ssl/PKCS11ModuleDB.cpp
@@ -164,20 +164,16 @@ PKCS11ModuleDB::ToggleFIPSMode() {
   if (!internal) {
     return NS_ERROR_FAILURE;
   }
 
   if (SECMOD_DeleteInternalModule(internal->commonName) != SECSuccess) {
     return NS_ERROR_FAILURE;
   }
 
-  if (PK11_IsFIPS()) {
-    Telemetry::Accumulate(Telemetry::FIPS_ENABLED, true);
-  }
-
   return NS_OK;
 }
 
 NS_IMETHODIMP
 PKCS11ModuleDB::GetIsFIPSEnabled(bool* aIsFIPSEnabled) {
   NS_ENSURE_ARG_POINTER(aIsFIPSEnabled);
 
   *aIsFIPSEnabled = PK11_IsFIPS();
--- a/security/manager/ssl/nsNSSComponent.cpp
+++ b/security/manager/ssl/nsNSSComponent.cpp
@@ -1771,20 +1771,16 @@ nsresult nsNSSComponent::InitializeNSS()
   if (NS_FAILED(rv)) {
     MOZ_LOG(gPIPNSSLog, LogLevel::Error,
             ("Unable to initialize cipher suite settings\n"));
     return NS_ERROR_FAILURE;
   }
 
   mozilla::pkix::RegisterErrorTable();
 
-  if (PK11_IsFIPS()) {
-    Telemetry::Accumulate(Telemetry::FIPS_ENABLED, true);
-  }
-
   MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("NSS Initialization done\n"));
 
   {
     MutexAutoLock lock(mMutex);
 
     // ensure we have initial values for various root hashes
 #ifdef DEBUG
     mTestBuiltInRootHash.Truncate();
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -9123,26 +9123,16 @@
   "FENNEC_WAS_KILLED": {
     "record_in_processes": ["main", "content"],
     "products": ["firefox", "fennec", "geckoview"],
     "expires_in_version": "never",
     "kind": "flag",
     "description": "Killed, likely due to an OOM condition",
     "operating_systems": ["android"]
   },
-  "FIPS_ENABLED": {
-    "record_in_processes": ["main", "content"],
-    "products": ["firefox", "fennec", "geckoview"],
-    "alert_emails": ["seceng@mozilla.org"],
-    "expires_in_version": "54",
-    "kind": "flag",
-    "bug_numbers": [1241317],
-    "releaseChannelCollection": "opt-out",
-    "description": "Has FIPS mode been enabled?"
-  },
   "SECURITY_UI": {
     "record_in_processes": ["main", "content"],
     "products": ["firefox", "fennec", "geckoview"],
     "alert_emails": ["seceng-telemetry@mozilla.com", "fxprivacyandsecurity@mozilla.com"],
     "bug_numbers": [767676],
     "expires_in_version": "never",
     "kind": "enumerated",
     "n_values": 100,
--- a/toolkit/components/telemetry/histogram-whitelists.json
+++ b/toolkit/components/telemetry/histogram-whitelists.json
@@ -1405,17 +1405,16 @@
     "FENNEC_SYNC11_MIGRATIONS_FAILED",
     "FENNEC_SYNC11_MIGRATIONS_SUCCEEDED",
     "FENNEC_SYNC11_MIGRATION_SENTINELS_SEEN",
     "FENNEC_SYNC_NUMBER_OF_SYNCS_COMPLETED",
     "FENNEC_SYNC_NUMBER_OF_SYNCS_FAILED",
     "FENNEC_SYNC_NUMBER_OF_SYNCS_FAILED_BACKOFF",
     "FENNEC_SYNC_NUMBER_OF_SYNCS_STARTED",
     "FENNEC_WAS_KILLED",
-    "FIPS_ENABLED",
     "FXA_CONFIGURED",
     "FX_BROWSER_FULLSCREEN_USED",
     "FX_CONTENT_CRASH_DUMP_UNAVAILABLE",
     "FX_CONTENT_CRASH_NOT_SUBMITTED",
     "FX_CONTENT_CRASH_PRESENTED",
     "FX_SESSION_RESTORE_SEND_UPDATE_CAUSED_OOM",
     "FX_TOUCH_USED",
     "GEOLOCATION_ERROR",