OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/cert/x509_util.h" | 5 #include "net/cert/x509_util.h" |
6 | 6 |
| 7 #include "base/basictypes.h" |
| 8 #include "base/memory/scoped_ptr.h" |
7 #include "base/time/time.h" | 9 #include "base/time/time.h" |
| 10 #include "crypto/ec_private_key.h" |
| 11 #include "crypto/rsa_private_key.h" |
8 #include "net/cert/x509_certificate.h" | 12 #include "net/cert/x509_certificate.h" |
9 | 13 |
10 namespace net { | 14 namespace net { |
11 | 15 |
12 namespace x509_util { | 16 namespace x509_util { |
13 | 17 |
| 18 // RSA keys created by CreateKeyAndSelfSignedCert will be of this length. |
| 19 static const uint16 kRSAKeyLength = 1024; |
| 20 |
| 21 // Certificates made by CreateKeyAndSelfSignedCert and |
| 22 // CreateKeyAndDomainBoundCertEC will be signed using this digest algorithm. |
| 23 static const DigestAlgorithm kSignatureDigestAlgorithm = DIGEST_SHA256; |
| 24 |
14 ClientCertSorter::ClientCertSorter() : now_(base::Time::Now()) {} | 25 ClientCertSorter::ClientCertSorter() : now_(base::Time::Now()) {} |
15 | 26 |
16 bool ClientCertSorter::operator()( | 27 bool ClientCertSorter::operator()( |
17 const scoped_refptr<X509Certificate>& a, | 28 const scoped_refptr<X509Certificate>& a, |
18 const scoped_refptr<X509Certificate>& b) const { | 29 const scoped_refptr<X509Certificate>& b) const { |
19 // Certificates that are null are sorted last. | 30 // Certificates that are null are sorted last. |
20 if (!a.get() || !b.get()) | 31 if (!a.get() || !b.get()) |
21 return a.get() && !b.get(); | 32 return a.get() && !b.get(); |
22 | 33 |
23 // Certificates that are expired/not-yet-valid are sorted last. | 34 // Certificates that are expired/not-yet-valid are sorted last. |
(...skipping 13 matching lines...) Expand all Loading... |
37 return a->valid_start() > b->valid_start(); | 48 return a->valid_start() > b->valid_start(); |
38 | 49 |
39 // Otherwise, prefer client certificates with shorter chains. | 50 // Otherwise, prefer client certificates with shorter chains. |
40 const X509Certificate::OSCertHandles& a_intermediates = | 51 const X509Certificate::OSCertHandles& a_intermediates = |
41 a->GetIntermediateCertificates(); | 52 a->GetIntermediateCertificates(); |
42 const X509Certificate::OSCertHandles& b_intermediates = | 53 const X509Certificate::OSCertHandles& b_intermediates = |
43 b->GetIntermediateCertificates(); | 54 b->GetIntermediateCertificates(); |
44 return a_intermediates.size() < b_intermediates.size(); | 55 return a_intermediates.size() < b_intermediates.size(); |
45 } | 56 } |
46 | 57 |
| 58 bool CreateKeyAndDomainBoundCertEC(const std::string& domain, |
| 59 uint32 serial_number, |
| 60 base::Time not_valid_before, |
| 61 base::Time not_valid_after, |
| 62 scoped_ptr<crypto::ECPrivateKey>* key, |
| 63 std::string* der_cert) { |
| 64 scoped_ptr<crypto::ECPrivateKey> new_key(crypto::ECPrivateKey::Create()); |
| 65 if (!new_key.get()) |
| 66 return false; |
| 67 |
| 68 bool success = CreateDomainBoundCertEC(new_key.get(), |
| 69 kSignatureDigestAlgorithm, |
| 70 domain, |
| 71 serial_number, |
| 72 not_valid_before, |
| 73 not_valid_after, |
| 74 der_cert); |
| 75 if (success) |
| 76 key->reset(new_key.release()); |
| 77 |
| 78 return success; |
| 79 } |
| 80 |
| 81 bool CreateKeyAndSelfSignedCert(const std::string& subject, |
| 82 uint32 serial_number, |
| 83 base::Time not_valid_before, |
| 84 base::Time not_valid_after, |
| 85 scoped_ptr<crypto::RSAPrivateKey>* key, |
| 86 std::string* der_cert) { |
| 87 scoped_ptr<crypto::RSAPrivateKey> new_key( |
| 88 crypto::RSAPrivateKey::Create(kRSAKeyLength)); |
| 89 if (!new_key.get()) |
| 90 return false; |
| 91 |
| 92 bool success = CreateSelfSignedCert(new_key.get(), |
| 93 kSignatureDigestAlgorithm, |
| 94 subject, |
| 95 serial_number, |
| 96 not_valid_before, |
| 97 not_valid_after, |
| 98 der_cert); |
| 99 if (success) |
| 100 key->reset(new_key.release()); |
| 101 |
| 102 return success; |
| 103 } |
| 104 |
47 } // namespace x509_util | 105 } // namespace x509_util |
48 | 106 |
49 } // namespace net | 107 } // namespace net |
OLD | NEW |