diff options
author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-12 01:25:43 +0100 |
---|---|---|
committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-12 01:25:43 +0100 |
commit | 263d8500ce68b279a2d055c322f0ab3eab634989 (patch) | |
tree | 9f258c3d6186346dc4435427ce6565ec376efd5d /security/manager/ssl/RootCertificateTelemetryUtils.h | |
parent | b06821da15b7ab2573cd18aea8048b94266e3a97 (diff) | |
parent | 8beab28bfff78ccefc8677c5bdddd6f60c544600 (diff) | |
download | UXP-263d8500ce68b279a2d055c322f0ab3eab634989.tar UXP-263d8500ce68b279a2d055c322f0ab3eab634989.tar.gz UXP-263d8500ce68b279a2d055c322f0ab3eab634989.tar.lz UXP-263d8500ce68b279a2d055c322f0ab3eab634989.tar.xz UXP-263d8500ce68b279a2d055c322f0ab3eab634989.zip |
Merge branch 'master' into Pale_Moon-release
# Conflicts:
# application/palemoon/components/preferences/advanced.xul
# application/palemoon/config/version.txt
# modules/libpref/init/all.js
Diffstat (limited to 'security/manager/ssl/RootCertificateTelemetryUtils.h')
-rw-r--r-- | security/manager/ssl/RootCertificateTelemetryUtils.h | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/security/manager/ssl/RootCertificateTelemetryUtils.h b/security/manager/ssl/RootCertificateTelemetryUtils.h deleted file mode 100644 index 05dbb4e44..000000000 --- a/security/manager/ssl/RootCertificateTelemetryUtils.h +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* vim: set ts=8 sts=2 et sw=2 tw=80: */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef RootCertificateTelemetryUtils_h -#define RootCertificateTelemetryUtils_h - -#include "mozilla/Telemetry.h" -#include "certt.h" - -namespace mozilla { namespace psm { - -// Note: New CAs will show up as UNKNOWN_ROOT until -// RootHashes.inc is updated to include them. 0 is reserved by -// genRootCAHashes.js for the unknowns. -#define ROOT_CERTIFICATE_UNKNOWN 0 -#define ROOT_CERTIFICATE_HASH_FAILURE -1 - -int32_t -RootCABinNumber(const SECItem* cert); - -void -AccumulateTelemetryForRootCA(mozilla::Telemetry::ID probe, const CERTCertificate* cert); - -} // namespace psm -} // namespace mozilla - -#endif // RootCertificateTelemetryUtils_h |