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

Side by Side Diff: net/quic/crypto/p256_key_exchange_openssl.cc

Issue 612323013: QUIC - (no behavior change) s/NULL/nullptr/g in .../quic/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 | « net/quic/crypto/p256_key_exchange_nss.cc ('k') | net/quic/crypto/p256_key_exchange_test.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/quic/crypto/p256_key_exchange.h" 5 #include "net/quic/crypto/p256_key_exchange.h"
6 6
7 #include <openssl/ec.h> 7 #include <openssl/ec.h>
8 #include <openssl/ecdh.h> 8 #include <openssl/ecdh.h>
9 #include <openssl/evp.h> 9 #include <openssl/evp.h>
10 10
11 #include "base/logging.h" 11 #include "base/logging.h"
12 12
13 using base::StringPiece; 13 using base::StringPiece;
14 using std::string; 14 using std::string;
15 15
16 namespace net { 16 namespace net {
17 17
18 P256KeyExchange::P256KeyExchange(EC_KEY* private_key, const uint8* public_key) 18 P256KeyExchange::P256KeyExchange(EC_KEY* private_key, const uint8* public_key)
19 : private_key_(private_key) { 19 : private_key_(private_key) {
20 memcpy(public_key_, public_key, sizeof(public_key_)); 20 memcpy(public_key_, public_key, sizeof(public_key_));
21 } 21 }
22 22
23 P256KeyExchange::~P256KeyExchange() {} 23 P256KeyExchange::~P256KeyExchange() {}
24 24
25 // static 25 // static
26 P256KeyExchange* P256KeyExchange::New(StringPiece key) { 26 P256KeyExchange* P256KeyExchange::New(StringPiece key) {
27 if (key.empty()) { 27 if (key.empty()) {
28 DVLOG(1) << "Private key is empty"; 28 DVLOG(1) << "Private key is empty";
29 return NULL; 29 return nullptr;
30 } 30 }
31 31
32 const uint8* keyp = reinterpret_cast<const uint8*>(key.data()); 32 const uint8* keyp = reinterpret_cast<const uint8*>(key.data());
33 crypto::ScopedEC_KEY private_key(d2i_ECPrivateKey(NULL, &keyp, key.size())); 33 crypto::ScopedEC_KEY private_key(d2i_ECPrivateKey(nullptr, &keyp,
34 key.size()));
34 if (!private_key.get() || !EC_KEY_check_key(private_key.get())) { 35 if (!private_key.get() || !EC_KEY_check_key(private_key.get())) {
35 DVLOG(1) << "Private key is invalid."; 36 DVLOG(1) << "Private key is invalid.";
36 return NULL; 37 return nullptr;
37 } 38 }
38 39
39 uint8 public_key[kUncompressedP256PointBytes]; 40 uint8 public_key[kUncompressedP256PointBytes];
40 if (EC_POINT_point2oct(EC_KEY_get0_group(private_key.get()), 41 if (EC_POINT_point2oct(EC_KEY_get0_group(private_key.get()),
41 EC_KEY_get0_public_key(private_key.get()), 42 EC_KEY_get0_public_key(private_key.get()),
42 POINT_CONVERSION_UNCOMPRESSED, public_key, 43 POINT_CONVERSION_UNCOMPRESSED, public_key,
43 sizeof(public_key), NULL) != sizeof(public_key)) { 44 sizeof(public_key), nullptr) != sizeof(public_key)) {
44 DVLOG(1) << "Can't get public key."; 45 DVLOG(1) << "Can't get public key.";
45 return NULL; 46 return nullptr;
46 } 47 }
47 48
48 return new P256KeyExchange(private_key.release(), public_key); 49 return new P256KeyExchange(private_key.release(), public_key);
49 } 50 }
50 51
51 // static 52 // static
52 string P256KeyExchange::NewPrivateKey() { 53 string P256KeyExchange::NewPrivateKey() {
53 crypto::ScopedEC_KEY key(EC_KEY_new_by_curve_name(NID_X9_62_prime256v1)); 54 crypto::ScopedEC_KEY key(EC_KEY_new_by_curve_name(NID_X9_62_prime256v1));
54 if (!key.get() || !EC_KEY_generate_key(key.get())) { 55 if (!key.get() || !EC_KEY_generate_key(key.get())) {
55 DVLOG(1) << "Can't generate a new private key."; 56 DVLOG(1) << "Can't generate a new private key.";
56 return string(); 57 return string();
57 } 58 }
58 59
59 int key_len = i2d_ECPrivateKey(key.get(), NULL); 60 int key_len = i2d_ECPrivateKey(key.get(), nullptr);
60 if (key_len <= 0) { 61 if (key_len <= 0) {
61 DVLOG(1) << "Can't convert private key to string"; 62 DVLOG(1) << "Can't convert private key to string";
62 return string(); 63 return string();
63 } 64 }
64 scoped_ptr<uint8[]> private_key(new uint8[key_len]); 65 scoped_ptr<uint8[]> private_key(new uint8[key_len]);
65 uint8* keyp = private_key.get(); 66 uint8* keyp = private_key.get();
66 if (!i2d_ECPrivateKey(key.get(), &keyp)) { 67 if (!i2d_ECPrivateKey(key.get(), &keyp)) {
67 DVLOG(1) << "Can't convert private key to string."; 68 DVLOG(1) << "Can't convert private key to string.";
68 return string(); 69 return string();
69 } 70 }
(...skipping 13 matching lines...) Expand all
83 return false; 84 return false;
84 } 85 }
85 86
86 crypto::ScopedOpenSSL<EC_POINT, EC_POINT_free>::Type point( 87 crypto::ScopedOpenSSL<EC_POINT, EC_POINT_free>::Type point(
87 EC_POINT_new(EC_KEY_get0_group(private_key_.get()))); 88 EC_POINT_new(EC_KEY_get0_group(private_key_.get())));
88 if (!point.get() || 89 if (!point.get() ||
89 !EC_POINT_oct2point( /* also test if point is on curve */ 90 !EC_POINT_oct2point( /* also test if point is on curve */
90 EC_KEY_get0_group(private_key_.get()), 91 EC_KEY_get0_group(private_key_.get()),
91 point.get(), 92 point.get(),
92 reinterpret_cast<const uint8*>(peer_public_value.data()), 93 reinterpret_cast<const uint8*>(peer_public_value.data()),
93 peer_public_value.size(), NULL)) { 94 peer_public_value.size(), nullptr)) {
94 DVLOG(1) << "Can't convert peer public value to curve point."; 95 DVLOG(1) << "Can't convert peer public value to curve point.";
95 return false; 96 return false;
96 } 97 }
97 98
98 uint8 result[kP256FieldBytes]; 99 uint8 result[kP256FieldBytes];
99 if (ECDH_compute_key(result, sizeof(result), point.get(), private_key_.get(), 100 if (ECDH_compute_key(result, sizeof(result), point.get(), private_key_.get(),
100 NULL) != sizeof(result)) { 101 nullptr) != sizeof(result)) {
101 DVLOG(1) << "Can't compute ECDH shared key."; 102 DVLOG(1) << "Can't compute ECDH shared key.";
102 return false; 103 return false;
103 } 104 }
104 105
105 out_result->assign(reinterpret_cast<char*>(result), sizeof(result)); 106 out_result->assign(reinterpret_cast<char*>(result), sizeof(result));
106 return true; 107 return true;
107 } 108 }
108 109
109 StringPiece P256KeyExchange::public_value() const { 110 StringPiece P256KeyExchange::public_value() const {
110 return StringPiece(reinterpret_cast<const char*>(public_key_), 111 return StringPiece(reinterpret_cast<const char*>(public_key_),
111 sizeof(public_key_)); 112 sizeof(public_key_));
112 } 113 }
113 114
114 QuicTag P256KeyExchange::tag() const { return kP256; } 115 QuicTag P256KeyExchange::tag() const { return kP256; }
115 116
116 } // namespace net 117 } // namespace net
117
OLDNEW
« no previous file with comments | « net/quic/crypto/p256_key_exchange_nss.cc ('k') | net/quic/crypto/p256_key_exchange_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698