diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-03 01:00:19 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-03 01:00:19 +0000 |
| commit | 111839ad9e4d10a13b02d200b9f97e8be2deec93 (patch) | |
| tree | da87e5465fb35e88c02a7adc0aecba30b17bb1b9 /net/base/x509_certificate.cc | |
| parent | 4bceab02af49cb6fc7ba1abe8d0dfca434c2922c (diff) | |
| download | chromium_src-111839ad9e4d10a13b02d200b9f97e8be2deec93.zip chromium_src-111839ad9e4d10a13b02d200b9f97e8be2deec93.tar.gz chromium_src-111839ad9e4d10a13b02d200b9f97e8be2deec93.tar.bz2 | |
Fix a benign off-by-one error of kNumSerials in IsBlacklisted.
Remove duplicate certificate data in google_diginotar.pem and
diginotar_public_ca_2025.pem.
R=agl@chromium.org
BUG=94673
TEST=none
Review URL: http://codereview.chromium.org/7792077
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99494 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/x509_certificate.cc')
| -rw-r--r-- | net/base/x509_certificate.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/base/x509_certificate.cc b/net/base/x509_certificate.cc index e96ece4..6a690ac 100644 --- a/net/base/x509_certificate.cc +++ b/net/base/x509_certificate.cc @@ -641,7 +641,7 @@ X509Certificate::~X509Certificate() { } bool X509Certificate::IsBlacklisted() const { - static const unsigned kNumSerials = 257; + static const unsigned kNumSerials = 256; static const unsigned kSerialBytes = 16; static const uint8 kSerials[kNumSerials][kSerialBytes] = { // Not a real certificate. For testing only. @@ -947,8 +947,9 @@ bool X509Certificate::IsBlacklisted() const { if (serial_number_.size() == sizeof(kDigiNotarLeadingZero) && memcmp(serial_number_.data(), kDigiNotarLeadingZero, sizeof(kDigiNotarLeadingZero)) == 0) { - UMA_HISTOGRAM_ENUMERATION("Net.SSLCertBlacklisted", kNumSerials, kNumSerials + 1); - return true; + UMA_HISTOGRAM_ENUMERATION("Net.SSLCertBlacklisted", kNumSerials, + kNumSerials + 1); + return true; } return false; |