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

Side by Side Diff: net/test/cert_test_util_nss.cc

Issue 429633004: Test NSSCertDatabaseChromeOS in the presence of the system slot. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « net/test/cert_test_util.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/test/cert_test_util.h" 5 #include "net/test/cert_test_util.h"
6 6
7 #include <pk11pub.h>
8 #include <secmodt.h>
9
7 #include "base/file_util.h" 10 #include "base/file_util.h"
8 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
9 #include "base/path_service.h" 12 #include "base/path_service.h"
13 #include "crypto/nss_util.h"
10 #include "crypto/rsa_private_key.h" 14 #include "crypto/rsa_private_key.h"
15 #include "net/cert/cert_type.h"
11 16
12 namespace net { 17 namespace net {
13 18
14 scoped_ptr<crypto::RSAPrivateKey> ImportSensitiveKeyFromFile( 19 scoped_ptr<crypto::RSAPrivateKey> ImportSensitiveKeyFromFile(
15 const base::FilePath& dir, 20 const base::FilePath& dir,
16 const std::string& key_filename, 21 const std::string& key_filename,
17 PK11SlotInfo* slot) { 22 PK11SlotInfo* slot) {
18 base::FilePath key_path = dir.AppendASCII(key_filename); 23 base::FilePath key_path = dir.AppendASCII(key_filename);
19 std::string key_pkcs8; 24 std::string key_pkcs8;
20 bool success = base::ReadFileToString(key_path, &key_pkcs8); 25 bool success = base::ReadFileToString(key_path, &key_pkcs8);
21 if (!success) { 26 if (!success) {
22 LOG(ERROR) << "Failed to read file " << key_path.value(); 27 LOG(ERROR) << "Failed to read file " << key_path.value();
23 return scoped_ptr<crypto::RSAPrivateKey>(); 28 return scoped_ptr<crypto::RSAPrivateKey>();
24 } 29 }
25 30
26 const uint8* key_pkcs8_begin = 31 const uint8* key_pkcs8_begin =
27 reinterpret_cast<const uint8*>(key_pkcs8.data()); 32 reinterpret_cast<const uint8*>(key_pkcs8.data());
28 std::vector<uint8> key_vector(key_pkcs8_begin, 33 std::vector<uint8> key_vector(key_pkcs8_begin,
29 key_pkcs8_begin + key_pkcs8.length()); 34 key_pkcs8_begin + key_pkcs8.length());
30 35
31 scoped_ptr<crypto::RSAPrivateKey> private_key( 36 scoped_ptr<crypto::RSAPrivateKey> private_key(
32 crypto::RSAPrivateKey::CreateSensitiveFromPrivateKeyInfo(slot, 37 crypto::RSAPrivateKey::CreateSensitiveFromPrivateKeyInfo(slot,
33 key_vector)); 38 key_vector));
34 LOG_IF(ERROR, !private_key) << "Could not create key from file " 39 LOG_IF(ERROR, !private_key) << "Could not create key from file "
35 << key_path.value(); 40 << key_path.value();
36 return private_key.Pass(); 41 return private_key.Pass();
37 } 42 }
38 43
44 bool ImportClientCertToSlot(const scoped_refptr<X509Certificate>& cert,
45 PK11SlotInfo* slot) {
46 std::string nickname = cert->GetDefaultNickname(USER_CERT);
47 {
48 crypto::AutoNSSWriteLock lock;
49 SECStatus rv = PK11_ImportCert(slot,
50 cert->os_cert_handle(),
51 CK_INVALID_HANDLE,
52 nickname.c_str(),
53 PR_FALSE);
54 if (rv != SECSuccess) {
55 LOG(ERROR) << "Could not import cert";
56 return false;
57 }
58 }
59 return true;
60 }
61
62 scoped_refptr<X509Certificate> ImportClientCertAndKeyFromFile(
63 const base::FilePath& dir,
64 const std::string& cert_filename,
65 const std::string& key_filename,
66 PK11SlotInfo* slot) {
67 if (!ImportSensitiveKeyFromFile(dir, key_filename, slot)) {
68 LOG(ERROR) << "Could not import private key from file " << key_filename;
69 return NULL;
70 }
71
72 scoped_refptr<X509Certificate> cert(ImportCertFromFile(dir, cert_filename));
73
74 if (!cert) {
75 LOG(ERROR) << "Failed to parse cert from file " << cert_filename;
76 return NULL;
77 }
78
79 if (!ImportClientCertToSlot(cert, slot))
80 return NULL;
81
82 // |cert| continues to point to the original X509Certificate before the
83 // import to |slot|. However this should not make a difference for this
84 // test.
mattm 2014/07/31 20:26:19 "this test" doesn't make sense in util code
85 return cert;
86 }
87
39 } // namespace net 88 } // namespace net
OLDNEW
« no previous file with comments | « net/test/cert_test_util.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698