Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(388)

Side by Side Diff: net/base/x509_certificate.cc

Issue 8568040: Refuse to accept certificate chains containing any RSA public key smaller (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/base/x509_certificate.h" 5 #include "net/base/x509_certificate.h"
6 6
7 #include <stdlib.h> 7 #include <stdlib.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <map> 10 #include <map>
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 CERT_STORE_ADD_USE_EXISTING, &cert_handle); 217 CERT_STORE_ADD_USE_EXISTING, &cert_handle);
218 return ok ? cert_handle : NULL; 218 return ok ? cert_handle : NULL;
219 } 219 }
220 #else 220 #else
221 X509Certificate::OSCertHandle CreateOSCert(base::StringPiece der_cert) { 221 X509Certificate::OSCertHandle CreateOSCert(base::StringPiece der_cert) {
222 return X509Certificate::CreateOSCertHandleFromBytes( 222 return X509Certificate::CreateOSCertHandleFromBytes(
223 const_cast<char*>(der_cert.data()), der_cert.size()); 223 const_cast<char*>(der_cert.data()), der_cert.size());
224 } 224 }
225 #endif 225 #endif
226 226
227 // Returns true if |type| is |kPublicKeyTypeRSA| or |kPublicKeyTypeDSA|, and
228 // if |size_bits| is < 1024. Note that this means there may be false
229 // negatives: keys for other algorithms and which are weak will pass this
230 // test.
231 bool IsWeakKey(X509Certificate::PublicKeyType type, size_t size_bits) {
232 switch (type) {
233 case X509Certificate::kPublicKeyTypeRSA:
234 case X509Certificate::kPublicKeyTypeDSA:
235 return size_bits < 1024;
236 default:
237 return false;
238 }
239 }
240
227 } // namespace 241 } // namespace
228 242
229 bool X509Certificate::LessThan::operator()(X509Certificate* lhs, 243 bool X509Certificate::LessThan::operator()(X509Certificate* lhs,
230 X509Certificate* rhs) const { 244 X509Certificate* rhs) const {
231 if (lhs == rhs) 245 if (lhs == rhs)
232 return false; 246 return false;
233 247
234 int rv = memcmp(lhs->fingerprint_.data, rhs->fingerprint_.data, 248 int rv = memcmp(lhs->fingerprint_.data, rhs->fingerprint_.data,
235 sizeof(lhs->fingerprint_.data)); 249 sizeof(lhs->fingerprint_.data));
236 if (rv != 0) 250 if (rv != 0)
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
590 604
591 int rv = VerifyInternal(hostname, flags, crl_set, verify_result); 605 int rv = VerifyInternal(hostname, flags, crl_set, verify_result);
592 606
593 // This check is done after VerifyInternal so that VerifyInternal can fill in 607 // This check is done after VerifyInternal so that VerifyInternal can fill in
594 // the list of public key hashes. 608 // the list of public key hashes.
595 if (IsPublicKeyBlacklisted(verify_result->public_key_hashes)) { 609 if (IsPublicKeyBlacklisted(verify_result->public_key_hashes)) {
596 verify_result->cert_status |= CERT_STATUS_REVOKED; 610 verify_result->cert_status |= CERT_STATUS_REVOKED;
597 rv = MapCertStatusToNetError(verify_result->cert_status); 611 rv = MapCertStatusToNetError(verify_result->cert_status);
598 } 612 }
599 613
614 // Check for weak keys in the entire verified chain.
615 size_t size_bits = 0;
616 PublicKeyType type = kPublicKeyTypeUnknown;
617 bool weak_key = false;
618
619 GetPublicKeyInfo(verify_result->verified_cert->os_cert_handle(), &size_bits,
620 &type);
621 if (IsWeakKey(type, size_bits)) {
622 weak_key = true;
623 } else {
624 const OSCertHandles& intermediates =
625 verify_result->verified_cert->GetIntermediateCertificates();
626 for (OSCertHandles::const_iterator i = intermediates.begin();
627 i != intermediates.end(); ++i) {
628 GetPublicKeyInfo(*i, &size_bits, &type);
629 if (IsWeakKey(type, size_bits))
630 weak_key = true;
631 }
632 }
633
634 if (weak_key) {
635 verify_result->cert_status |= CERT_STATUS_WEAK_KEY;
636 return MapCertStatusToNetError(verify_result->cert_status);
637 }
638
600 return rv; 639 return rv;
601 } 640 }
602 641
603 #if !defined(USE_NSS) 642 #if !defined(USE_NSS)
604 bool X509Certificate::VerifyNameMatch(const std::string& hostname) const { 643 bool X509Certificate::VerifyNameMatch(const std::string& hostname) const {
605 std::vector<std::string> dns_names, ip_addrs; 644 std::vector<std::string> dns_names, ip_addrs;
606 GetSubjectAltName(&dns_names, &ip_addrs); 645 GetSubjectAltName(&dns_names, &ip_addrs);
607 return VerifyHostname(hostname, subject_.common_name, dns_names, ip_addrs); 646 return VerifyHostname(hostname, subject_.common_name, dns_names, ip_addrs);
608 } 647 }
609 #endif 648 #endif
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
798 bool X509Certificate::IsSHA1HashInSortedArray(const SHA1Fingerprint& hash, 837 bool X509Certificate::IsSHA1HashInSortedArray(const SHA1Fingerprint& hash,
799 const uint8* array, 838 const uint8* array,
800 size_t array_byte_len) { 839 size_t array_byte_len) {
801 DCHECK_EQ(0u, array_byte_len % base::kSHA1Length); 840 DCHECK_EQ(0u, array_byte_len % base::kSHA1Length);
802 const size_t arraylen = array_byte_len / base::kSHA1Length; 841 const size_t arraylen = array_byte_len / base::kSHA1Length;
803 return NULL != bsearch(hash.data, array, arraylen, base::kSHA1Length, 842 return NULL != bsearch(hash.data, array, arraylen, base::kSHA1Length,
804 CompareSHA1Hashes); 843 CompareSHA1Hashes);
805 } 844 }
806 845
807 } // namespace net 846 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698