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

Side by Side Diff: net/test/cert_test_util.h

Issue 1082123003: Rename USE_NSS to USE_NSS_CERTS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@use-nss-certs
Patch Set: rebase Created 5 years, 8 months 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
« no previous file with comments | « net/ssl/channel_id_service.cc ('k') | net/test/net_test_suite.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef NET_TEST_CERT_TEST_UTIL_H_ 5 #ifndef NET_TEST_CERT_TEST_UTIL_H_
6 #define NET_TEST_CERT_TEST_UTIL_H_ 6 #define NET_TEST_CERT_TEST_UTIL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "net/cert/x509_cert_types.h" 11 #include "net/cert/x509_cert_types.h"
12 #include "net/cert/x509_certificate.h" 12 #include "net/cert/x509_certificate.h"
13 13
14 #if defined(USE_NSS) 14 #if defined(USE_NSS_CERTS)
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 16
17 // From <pk11pub.h> 17 // From <pk11pub.h>
18 typedef struct PK11SlotInfoStr PK11SlotInfo; 18 typedef struct PK11SlotInfoStr PK11SlotInfo;
19 #endif 19 #endif
20 20
21 namespace base { 21 namespace base {
22 class FilePath; 22 class FilePath;
23 } 23 }
24 24
25 namespace crypto { 25 namespace crypto {
26 class RSAPrivateKey; 26 class RSAPrivateKey;
27 } 27 }
28 28
29 namespace net { 29 namespace net {
30 30
31 class EVRootCAMetadata; 31 class EVRootCAMetadata;
32 32
33 #if defined(USE_NSS) 33 #if defined(USE_NSS_CERTS)
34 // Imports a private key from file |key_filename| in |dir|. The file must 34 // Imports a private key from file |key_filename| in |dir|. The file must
35 // contain a PKCS#8 PrivateKeyInfo in DER encoding. The key is imported to 35 // contain a PKCS#8 PrivateKeyInfo in DER encoding. The key is imported to
36 // |slot|. 36 // |slot|.
37 scoped_ptr<crypto::RSAPrivateKey> ImportSensitiveKeyFromFile( 37 scoped_ptr<crypto::RSAPrivateKey> ImportSensitiveKeyFromFile(
38 const base::FilePath& dir, 38 const base::FilePath& dir,
39 const std::string& key_filename, 39 const std::string& key_filename,
40 PK11SlotInfo* slot); 40 PK11SlotInfo* slot);
41 41
42 bool ImportClientCertToSlot(const scoped_refptr<X509Certificate>& cert, 42 bool ImportClientCertToSlot(const scoped_refptr<X509Certificate>& cert,
43 PK11SlotInfo* slot); 43 PK11SlotInfo* slot);
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 ~ScopedTestEVPolicy(); 84 ~ScopedTestEVPolicy();
85 85
86 private: 86 private:
87 SHA1HashValue fingerprint_; 87 SHA1HashValue fingerprint_;
88 EVRootCAMetadata* const ev_root_ca_metadata_; 88 EVRootCAMetadata* const ev_root_ca_metadata_;
89 }; 89 };
90 90
91 } // namespace net 91 } // namespace net
92 92
93 #endif // NET_TEST_CERT_TEST_UTIL_H_ 93 #endif // NET_TEST_CERT_TEST_UTIL_H_
OLDNEW
« no previous file with comments | « net/ssl/channel_id_service.cc ('k') | net/test/net_test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698