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

Side by Side Diff: crypto/ec_private_key_openssl.cc

Issue 27195002: openssl: Implement crypto::ECPrivateKey. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Trivial rebase Created 7 years, 2 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 | « no previous file | crypto/ec_private_key_unittest.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 #include "crypto/ec_private_key.h" 5 #include "crypto/ec_private_key.h"
6 6
7 #include <openssl/ec.h>
8 #include <openssl/evp.h>
9 #include <openssl/pkcs12.h>
10 #include <openssl/x509.h>
11
7 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "crypto/openssl_util.h"
8 15
9 namespace crypto { 16 namespace crypto {
10 17
11 ECPrivateKey::~ECPrivateKey() {} 18 namespace {
12 19
13 // static 20 // Function pointer definition, for injecting the required key export function
14 bool ECPrivateKey::IsSupported() { 21 // into ExportKeyWithBio, below. |bio| is a temporary memory BIO object, and
15 return false; 22 // |key| is a handle to the input key object. Return 1 on success, 0 otherwise.
23 // NOTE: Used with OpenSSL functions, which do not comply with the Chromium
24 // style guide, hence the unusual parameter placement / types.
25 typedef int (*ExportBioFunction)(BIO* bio, const void* key);
26
27 // Helper to export |key| into |output| via the specified ExportBioFunction.
28 bool ExportKeyWithBio(const void* key,
29 ExportBioFunction export_fn,
30 std::vector<uint8>* output) {
31 if (!key)
32 return false;
33
34 ScopedOpenSSL<BIO, BIO_free_all> bio(BIO_new(BIO_s_mem()));
35 if (!bio.get())
36 return false;
37
38 if (!export_fn(bio.get(), key))
39 return false;
40
41 char* data = NULL;
42 long len = BIO_get_mem_data(bio.get(), &data);
43 if (!data || len < 0)
44 return false;
45
46 output->assign(data, data + len);
47 return true;
48 }
49
50 // Function pointer definition, for injecting the required key export function
51 // into ExportKey below. |key| is a pointer to the input key object,
52 // and |data| is either NULL, or the address of an 'unsigned char*' pointer
53 // that points to the start of the output buffer. The function must return
54 // the number of bytes required to export the data, or -1 in case of error.
55 typedef int (*ExportDataFunction)(const void* key, unsigned char** data);
56
57 // Helper to export |key| into |output| via the specified export function.
58 bool ExportKey(const void* key,
59 ExportDataFunction export_fn,
60 std::vector<uint8>* output) {
61 if (!key)
62 return false;
63
64 int data_len = export_fn(key, NULL);
65 if (data_len < 0)
66 return false;
67
68 output->resize(static_cast<size_t>(data_len));
69 unsigned char* data = &(*output)[0];
70 if (export_fn(key, &data) < 0)
71 return false;
72
73 return true;
74 }
75
76 } // namespace
77
78 ECPrivateKey::~ECPrivateKey() {
79 if (key_)
80 EVP_PKEY_free(key_);
16 } 81 }
17 82
18 // static 83 // static
84 bool ECPrivateKey::IsSupported() { return true; }
85
86 // static
19 ECPrivateKey* ECPrivateKey::Create() { 87 ECPrivateKey* ECPrivateKey::Create() {
20 NOTIMPLEMENTED(); 88 OpenSSLErrStackTracer err_tracer(FROM_HERE);
21 return NULL; 89
90 ScopedOpenSSL<EC_KEY, EC_KEY_free> ec_key(
91 EC_KEY_new_by_curve_name(NID_X9_62_prime256v1));
92 if (!ec_key.get() || !EC_KEY_generate_key(ec_key.get()))
93 return NULL;
94
95 scoped_ptr<ECPrivateKey> result(new ECPrivateKey());
96 result->key_ = EVP_PKEY_new();
97 if (!result->key_ || !EVP_PKEY_set1_EC_KEY(result->key_, ec_key.get()))
98 return NULL;
99
100 return result.release();
22 } 101 }
23 102
24 // static 103 // static
25 ECPrivateKey* ECPrivateKey::CreateSensitive() { 104 ECPrivateKey* ECPrivateKey::CreateSensitive() {
26 NOTIMPLEMENTED(); 105 NOTIMPLEMENTED();
27 return NULL; 106 return NULL;
28 } 107 }
29 108
30 // static 109 // static
31 ECPrivateKey* ECPrivateKey::CreateFromEncryptedPrivateKeyInfo( 110 ECPrivateKey* ECPrivateKey::CreateFromEncryptedPrivateKeyInfo(
32 const std::string& password, 111 const std::string& password,
33 const std::vector<uint8>& encrypted_private_key_info, 112 const std::vector<uint8>& encrypted_private_key_info,
34 const std::vector<uint8>& subject_public_key_info) { 113 const std::vector<uint8>& subject_public_key_info) {
35 NOTIMPLEMENTED(); 114 if (encrypted_private_key_info.empty() || subject_public_key_info.empty())
36 return NULL; 115 return NULL;
116
117 OpenSSLErrStackTracer err_tracer(FROM_HERE);
118 // Write the encrypted private key into a memory BIO.
119 char* private_key_data = reinterpret_cast<char*>(
120 const_cast<uint8*>(&encrypted_private_key_info[0]));
121 int private_key_data_len =
122 static_cast<int>(encrypted_private_key_info.size());
123 ScopedOpenSSL<BIO, BIO_free_all> bio(
124 BIO_new_mem_buf(private_key_data, private_key_data_len));
125 if (!bio.get())
126 return NULL;
127
128 // Convert it, then decrypt it into a PKCS#8 object.
129 ScopedOpenSSL<X509_SIG, X509_SIG_free> p8_encrypted(
130 d2i_PKCS8_bio(bio.get(), NULL));
131 if (!p8_encrypted.get())
132 return NULL;
133
134 ScopedOpenSSL<PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_free> p8_decrypted(
135 PKCS8_decrypt(p8_encrypted.get(),
136 password.c_str(),
137 static_cast<int>(password.size())));
138 if (!p8_decrypted.get())
139 return NULL;
140
141 // Create a new EVP_PKEY for it.
142 scoped_ptr<ECPrivateKey> result(new ECPrivateKey);
143 result->key_ = EVP_PKCS82PKEY(p8_decrypted.get());
144 if (!result->key_)
145 return NULL;
146
147 // NOTE: The |subject_public_key_info| can be ignored here, it is only
148 // useful for the NSS implementation (which uses the public key's SHA1
149 // as a lookup key when storing the private one in its store).
wtc 2013/10/15 23:13:25 Nit: move this note to the beginning of the functi
digit1 2013/10/17 08:12:13 Done.
150
151 return result.release();
37 } 152 }
38 153
39 // static 154 // static
40 ECPrivateKey* ECPrivateKey::CreateSensitiveFromEncryptedPrivateKeyInfo( 155 ECPrivateKey* ECPrivateKey::CreateSensitiveFromEncryptedPrivateKeyInfo(
41 const std::string& password, 156 const std::string& password,
42 const std::vector<uint8>& encrypted_private_key_info, 157 const std::vector<uint8>& encrypted_private_key_info,
43 const std::vector<uint8>& subject_public_key_info) { 158 const std::vector<uint8>& subject_public_key_info) {
44 NOTIMPLEMENTED(); 159 NOTIMPLEMENTED();
45 return NULL; 160 return NULL;
46 } 161 }
47 162
48 bool ECPrivateKey::ExportEncryptedPrivateKey( 163 bool ECPrivateKey::ExportEncryptedPrivateKey(
49 const std::string& password, 164 const std::string& password,
50 int iterations, 165 int iterations,
51 std::vector<uint8>* output) { 166 std::vector<uint8>* output) {
52 NOTIMPLEMENTED(); 167 OpenSSLErrStackTracer err_tracer(FROM_HERE);
53 return false; 168 // Convert into a PKCS#8 object.
169 ScopedOpenSSL<PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_free> pkcs8(
170 EVP_PKEY2PKCS8(key_));
171 if (!pkcs8.get())
172 return false;
173
174 // Encrypt the object.
175 // NOTE: NSS uses SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_3KEY_TRIPLE_DES_CBC
176 // so use NID_pbe_WithSHA1And3_Key_TripleDES_CBC which should be the OpenSSL
177 // equivalent.
178 ScopedOpenSSL<X509_SIG, X509_SIG_free> encrypted(
179 PKCS8_encrypt(NID_pbe_WithSHA1And3_Key_TripleDES_CBC,
180 NULL,
181 password.c_str(),
182 static_cast<int>(password.size()),
183 NULL,
184 0,
185 iterations,
186 pkcs8.get()));
187 if (!encrypted.get())
188 return false;
189
190 // Write it into |*output|
191 return ExportKeyWithBio(encrypted.get(),
192 reinterpret_cast<ExportBioFunction>(i2d_PKCS8_bio),
193 output);
54 } 194 }
55 195
56 bool ECPrivateKey::ExportPublicKey(std::vector<uint8>* output) { 196 bool ECPrivateKey::ExportPublicKey(std::vector<uint8>* output) {
57 NOTIMPLEMENTED(); 197 OpenSSLErrStackTracer err_tracer(FROM_HERE);
58 return false; 198 return ExportKeyWithBio(
199 key_, reinterpret_cast<ExportBioFunction>(i2d_PUBKEY_bio), output);
59 } 200 }
60 201
61 bool ECPrivateKey::ExportValue(std::vector<uint8>* output) { 202 bool ECPrivateKey::ExportValue(std::vector<uint8>* output) {
62 NOTIMPLEMENTED(); 203 OpenSSLErrStackTracer err_tracer(FROM_HERE);
63 return false; 204 ScopedOpenSSL<EC_KEY, EC_KEY_free> ec_key(EVP_PKEY_get1_EC_KEY(key_));
205 return ExportKey(ec_key.get(),
206 reinterpret_cast<ExportDataFunction>(i2d_ECPrivateKey),
207 output);
64 } 208 }
65 209
66 bool ECPrivateKey::ExportECParams(std::vector<uint8>* output) { 210 bool ECPrivateKey::ExportECParams(std::vector<uint8>* output) {
67 NOTIMPLEMENTED(); 211 OpenSSLErrStackTracer err_tracer(FROM_HERE);
68 return false; 212 ScopedOpenSSL<EC_KEY, EC_KEY_free> ec_key(EVP_PKEY_get1_EC_KEY(key_));
213 return ExportKey(ec_key.get(),
214 reinterpret_cast<ExportDataFunction>(i2d_ECParameters),
215 output);
69 } 216 }
70 217
218 ECPrivateKey::ECPrivateKey() : key_(NULL) {}
219
71 } // namespace crypto 220 } // namespace crypto
OLDNEW
« no previous file with comments | « no previous file | crypto/ec_private_key_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698