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/base/x509_certificate.h" | 5 #include "net/cert/x509_certificate.h" |
6 | 6 |
7 #include <cert.h> | 7 #include <cert.h> |
8 #include <cryptohi.h> | 8 #include <cryptohi.h> |
9 #include <keyhi.h> | 9 #include <keyhi.h> |
10 #include <nss.h> | 10 #include <nss.h> |
11 #include <pk11pub.h> | 11 #include <pk11pub.h> |
12 #include <prtime.h> | 12 #include <prtime.h> |
13 #include <seccomon.h> | 13 #include <seccomon.h> |
14 #include <secder.h> | 14 #include <secder.h> |
15 #include <sechash.h> | 15 #include <sechash.h> |
16 | 16 |
17 #include "base/logging.h" | 17 #include "base/logging.h" |
18 #include "base/memory/scoped_ptr.h" | 18 #include "base/memory/scoped_ptr.h" |
19 #include "base/pickle.h" | 19 #include "base/pickle.h" |
20 #include "base/time.h" | 20 #include "base/time.h" |
21 #include "crypto/nss_util.h" | 21 #include "crypto/nss_util.h" |
22 #include "crypto/rsa_private_key.h" | 22 #include "crypto/rsa_private_key.h" |
23 #include "crypto/scoped_nss_types.h" | 23 #include "crypto/scoped_nss_types.h" |
24 #include "net/base/x509_util_nss.h" | 24 #include "net/cert/x509_util_nss.h" |
25 | 25 |
26 namespace net { | 26 namespace net { |
27 | 27 |
28 void X509Certificate::Initialize() { | 28 void X509Certificate::Initialize() { |
29 x509_util::ParsePrincipal(&cert_handle_->subject, &subject_); | 29 x509_util::ParsePrincipal(&cert_handle_->subject, &subject_); |
30 x509_util::ParsePrincipal(&cert_handle_->issuer, &issuer_); | 30 x509_util::ParsePrincipal(&cert_handle_->issuer, &issuer_); |
31 | 31 |
32 x509_util::ParseDate(&cert_handle_->validity.notBefore, &valid_start_); | 32 x509_util::ParseDate(&cert_handle_->validity.notBefore, &valid_start_); |
33 x509_util::ParseDate(&cert_handle_->validity.notAfter, &valid_expiry_); | 33 x509_util::ParseDate(&cert_handle_->validity.notAfter, &valid_expiry_); |
34 | 34 |
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
297 } | 297 } |
298 | 298 |
299 // static | 299 // static |
300 void X509Certificate::GetPublicKeyInfo(OSCertHandle cert_handle, | 300 void X509Certificate::GetPublicKeyInfo(OSCertHandle cert_handle, |
301 size_t* size_bits, | 301 size_t* size_bits, |
302 PublicKeyType* type) { | 302 PublicKeyType* type) { |
303 x509_util::GetPublicKeyInfo(cert_handle, size_bits, type); | 303 x509_util::GetPublicKeyInfo(cert_handle, size_bits, type); |
304 } | 304 } |
305 | 305 |
306 } // namespace net | 306 } // namespace net |
OLD | NEW |