bug 1241317 - gather telemetry on prevalence of FIPS r=jcj r=vladan

This commit is contained in:
David Keeler 2016-01-21 11:22:12 -08:00
parent 6414b6b707
commit e005138b30
3 changed files with 20 additions and 9 deletions

View File

@ -1117,6 +1117,9 @@ nsNSSComponent::InitializeNSS()
return NS_ERROR_FAILURE;
}
if (PK11_IsFIPS()) {
Telemetry::Accumulate(Telemetry::FIPS_ENABLED, true);
}
MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("NSS Initialization done\n"));
return NS_OK;

View File

@ -3,17 +3,13 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsPKCS11Slot.h"
#include "nsPK11TokenDB.h"
#include "nsCOMPtr.h"
#include "nsISupportsArray.h"
#include "nsString.h"
#include "nsReadableUtils.h"
#include "nsCRT.h"
#include "secmod.h"
#include "mozilla/Logging.h"
#include "mozilla/Telemetry.h"
#include "nsCOMPtr.h"
#include "nsISupportsArray.h"
#include "nsPK11TokenDB.h"
#include "secmod.h"
using mozilla::LogLevel;
@ -480,6 +476,10 @@ NS_IMETHODIMP nsPKCS11ModuleDB::ToggleFIPSMode()
if (srv != SECSuccess)
return NS_ERROR_FAILURE;
if (PK11_IsFIPS()) {
Telemetry::Accumulate(Telemetry::FIPS_ENABLED, true);
}
return NS_OK;
}

View File

@ -5160,6 +5160,14 @@
"description": "Killed, likely due to an OOM condition",
"cpp_guard": "ANDROID"
},
"FIPS_ENABLED": {
"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": {
"expires_in_version": "never",
"kind": "enumerated",