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_util.h" | 5 #include "net/cert/x509_util.h" |
6 #include "net/base/x509_util_nss.h" | 6 #include "net/cert/x509_util_nss.h" |
7 | 7 |
8 #include <cert.h> | 8 #include <cert.h> |
9 #include <cryptohi.h> | 9 #include <cryptohi.h> |
10 #include <nss.h> | 10 #include <nss.h> |
11 #include <pk11pub.h> | 11 #include <pk11pub.h> |
12 #include <prerror.h> | 12 #include <prerror.h> |
13 #include <secder.h> | 13 #include <secder.h> |
14 #include <secmod.h> | 14 #include <secmod.h> |
15 #include <secport.h> | 15 #include <secport.h> |
16 | 16 |
17 #include "base/debug/leak_annotations.h" | 17 #include "base/debug/leak_annotations.h" |
18 #include "base/logging.h" | 18 #include "base/logging.h" |
19 #include "base/memory/scoped_ptr.h" | 19 #include "base/memory/scoped_ptr.h" |
20 #include "base/memory/singleton.h" | 20 #include "base/memory/singleton.h" |
21 #include "base/pickle.h" | 21 #include "base/pickle.h" |
22 #include "crypto/ec_private_key.h" | 22 #include "crypto/ec_private_key.h" |
23 #include "crypto/nss_util.h" | 23 #include "crypto/nss_util.h" |
24 #include "crypto/nss_util_internal.h" | 24 #include "crypto/nss_util_internal.h" |
25 #include "crypto/scoped_nss_types.h" | 25 #include "crypto/scoped_nss_types.h" |
26 #include "crypto/third_party/nss/chromium-nss.h" | 26 #include "crypto/third_party/nss/chromium-nss.h" |
27 #include "net/base/x509_certificate.h" | 27 #include "net/cert/x509_certificate.h" |
28 | 28 |
29 namespace net { | 29 namespace net { |
30 | 30 |
31 namespace { | 31 namespace { |
32 | 32 |
33 class DomainBoundCertOIDWrapper { | 33 class DomainBoundCertOIDWrapper { |
34 public: | 34 public: |
35 static DomainBoundCertOIDWrapper* GetInstance() { | 35 static DomainBoundCertOIDWrapper* GetInstance() { |
36 // Instantiated as a leaky singleton to allow the singleton to be | 36 // Instantiated as a leaky singleton to allow the singleton to be |
37 // constructed on a worker thead that is not joined when a process | 37 // constructed on a worker thead that is not joined when a process |
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
591 } | 591 } |
592 } | 592 } |
593 return false; | 593 return false; |
594 } | 594 } |
595 | 595 |
596 #endif // defined(USE_NSS) || defined(OS_IOS) | 596 #endif // defined(USE_NSS) || defined(OS_IOS) |
597 | 597 |
598 } // namespace x509_util | 598 } // namespace x509_util |
599 | 599 |
600 } // namespace net | 600 } // namespace net |
OLD | NEW |