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

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

Issue 189893002: Add ChaCha20Poly1305Encrypter, based on (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Export AeadBase*crypter Created 6 years, 9 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
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/aes_128_gcm_12_encrypter.h" 5 #include "net/quic/crypto/aead_base_encrypter.h"
6 6
7 #include <nss.h>
8 #include <pk11pub.h> 7 #include <pk11pub.h>
9 #include <secerr.h> 8 #include <secerr.h>
10 9
11 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
12 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
13 #include "crypto/ghash.h" 12 #include "crypto/ghash.h"
14 #include "crypto/scoped_nss_types.h" 13 #include "crypto/scoped_nss_types.h"
15 14
16 #if defined(USE_NSS) 15 #if defined(USE_NSS)
17 #include <dlfcn.h> 16 #include <dlfcn.h>
18 #endif 17 #endif
19 18
20 using base::StringPiece; 19 using base::StringPiece;
21 20
22 namespace net { 21 namespace net {
23 22
24 namespace { 23 namespace {
25 24
26 // The pkcs11t.h header in NSS versions older than 3.14 does not have the CTR
27 // and GCM types, so define them here.
28 #if !defined(CKM_AES_CTR)
29 #define CKM_AES_CTR 0x00001086
30 #define CKM_AES_GCM 0x00001087
31
32 struct CK_AES_CTR_PARAMS {
33 CK_ULONG ulCounterBits;
34 CK_BYTE cb[16];
35 };
36
37 struct CK_GCM_PARAMS {
38 CK_BYTE_PTR pIv;
39 CK_ULONG ulIvLen;
40 CK_BYTE_PTR pAAD;
41 CK_ULONG ulAADLen;
42 CK_ULONG ulTagBits;
43 };
44 #endif // CKM_AES_CTR
45
46 typedef SECStatus 25 typedef SECStatus
47 (*PK11_EncryptFunction)( 26 (*PK11_EncryptFunction)(
48 PK11SymKey* symKey, CK_MECHANISM_TYPE mechanism, SECItem* param, 27 PK11SymKey* symKey, CK_MECHANISM_TYPE mechanism, SECItem* param,
49 unsigned char* out, unsigned int* outLen, unsigned int maxLen, 28 unsigned char* out, unsigned int* outLen, unsigned int maxLen,
50 const unsigned char* data, unsigned int dataLen); 29 const unsigned char* data, unsigned int dataLen);
51 30
52 // On Linux, dynamically link against the system version of libnss3.so. In 31 // On Linux, dynamically link against the system version of libnss3.so. In
53 // order to continue working on systems without up-to-date versions of NSS, 32 // order to continue working on systems without up-to-date versions of NSS,
54 // lookup PK11_Encrypt with dlsym. 33 // lookup PK11_Encrypt with dlsym.
55 34
56 // GcmSupportChecker is a singleton which caches the results of runtime symbol 35 // AeadSupportChecker is a singleton which caches the results of runtime symbol
57 // resolution of PK11_Encrypt. 36 // resolution of PK11_Encrypt.
58 class GcmSupportChecker { 37 class AeadSupportChecker {
59 public: 38 public:
60 static PK11_EncryptFunction pk11_encrypt_func() { 39 static PK11_EncryptFunction pk11_encrypt_func() {
61 return pk11_encrypt_func_; 40 return pk11_encrypt_func_;
62 } 41 }
63 42
64 static CK_MECHANISM_TYPE aes_key_mechanism() { 43 private:
65 return aes_key_mechanism_; 44 friend struct base::DefaultLazyInstanceTraits<AeadSupportChecker>;
66 }
67 45
68 private: 46 AeadSupportChecker() {
69 friend struct base::DefaultLazyInstanceTraits<GcmSupportChecker>;
70
71 GcmSupportChecker() {
72 #if !defined(USE_NSS) 47 #if !defined(USE_NSS)
73 // Using a bundled version of NSS that is guaranteed to have this symbol. 48 // Using a bundled version of NSS that is guaranteed to have this symbol.
74 pk11_encrypt_func_ = PK11_Encrypt; 49 pk11_encrypt_func_ = PK11_Encrypt;
75 #else 50 #else
76 // Using system NSS libraries and PCKS #11 modules, which may not have the 51 // Using system NSS libraries and PCKS #11 modules, which may not have the
77 // necessary function (PK11_Encrypt) or mechanism support (CKM_AES_GCM). 52 // necessary function (PK11_Encrypt) or mechanism support (CKM_AES_GCM).
78 53
79 // If PK11_Encrypt() was successfully resolved, then NSS will support 54 // If PK11_Encrypt() was successfully resolved, then NSS will support
80 // AES-GCM directly. This was introduced in NSS 3.15. 55 // AES-GCM directly. This was introduced in NSS 3.15.
81 pk11_encrypt_func_ = (PK11_EncryptFunction)dlsym(RTLD_DEFAULT, 56 pk11_encrypt_func_ = (PK11_EncryptFunction)dlsym(RTLD_DEFAULT,
82 "PK11_Encrypt"); 57 "PK11_Encrypt");
83 if (pk11_encrypt_func_ == NULL) {
84 aes_key_mechanism_ = CKM_AES_ECB;
85 }
86 #endif 58 #endif
87 } 59 }
88 60
89 // |pk11_encrypt_func_| stores the runtime symbol resolution of PK11_Encrypt. 61 // |pk11_encrypt_func_| stores the runtime symbol resolution of PK11_Encrypt.
90 static PK11_EncryptFunction pk11_encrypt_func_; 62 static PK11_EncryptFunction pk11_encrypt_func_;
91
92 // The correct value for |aes_key_mechanism_| is CKM_AES_GCM, but because of
93 // NSS bug https://bugzilla.mozilla.org/show_bug.cgi?id=853285 (to be fixed in
94 // NSS 3.15), use CKM_AES_ECB for NSS versions older than 3.15.
95 static CK_MECHANISM_TYPE aes_key_mechanism_;
96 }; 63 };
97 64
98 // static 65 // static
99 PK11_EncryptFunction GcmSupportChecker::pk11_encrypt_func_ = NULL; 66 PK11_EncryptFunction AeadSupportChecker::pk11_encrypt_func_ = NULL;
100 67
101 // static 68 base::LazyInstance<AeadSupportChecker>::Leaky g_aead_support_checker =
102 CK_MECHANISM_TYPE GcmSupportChecker::aes_key_mechanism_ = CKM_AES_GCM;
103
104 base::LazyInstance<GcmSupportChecker>::Leaky g_gcm_support_checker =
105 LAZY_INSTANCE_INITIALIZER; 69 LAZY_INSTANCE_INITIALIZER;
106 70
107 const size_t kKeySize = 16;
108 const size_t kNoncePrefixSize = 4;
109 const size_t kAESNonceSize = 12;
110
111 // Calls PK11_Encrypt if it's available. Otherwise, emulates CKM_AES_GCM using 71 // Calls PK11_Encrypt if it's available. Otherwise, emulates CKM_AES_GCM using
112 // CKM_AES_CTR and the GaloisHash class. 72 // CKM_AES_CTR and the GaloisHash class.
113 SECStatus My_Encrypt(PK11SymKey* key, 73 SECStatus My_Encrypt(PK11SymKey* key,
114 CK_MECHANISM_TYPE mechanism, 74 CK_MECHANISM_TYPE mechanism,
115 SECItem* param, 75 SECItem* param,
116 unsigned char* out, 76 unsigned char* out,
117 unsigned int* out_len, 77 unsigned int* out_len,
118 unsigned int max_len, 78 unsigned int max_len,
119 const unsigned char* data, 79 const unsigned char* data,
120 unsigned int data_len) { 80 unsigned int data_len) {
121 // If PK11_Encrypt() was successfully resolved or if bundled version of NSS is 81 // If PK11_Encrypt() was successfully resolved or if bundled version of NSS is
122 // being used, then NSS will support AES-GCM directly. 82 // being used, use PK11_Encrypt().
123 PK11_EncryptFunction pk11_encrypt_func = 83 PK11_EncryptFunction pk11_encrypt_func =
124 GcmSupportChecker::pk11_encrypt_func(); 84 AeadSupportChecker::pk11_encrypt_func();
125 if (pk11_encrypt_func != NULL) { 85 if (pk11_encrypt_func != NULL) {
126 return pk11_encrypt_func(key, mechanism, param, out, out_len, max_len, data, 86 return pk11_encrypt_func(key, mechanism, param, out, out_len, max_len, data,
127 data_len); 87 data_len);
128 } 88 }
129 89
130 // Otherwise, the user has an older version of NSS. Regrettably, NSS 3.14.x 90 // Otherwise, the user has an older version of NSS. Regrettably, NSS 3.14.x
131 // has a bug in the AES GCM code 91 // has a bug in the AES GCM code
132 // (https://bugzilla.mozilla.org/show_bug.cgi?id=853285), as well as missing 92 // (https://bugzilla.mozilla.org/show_bug.cgi?id=853285), as well as missing
133 // the PK11_Encrypt function 93 // the PK11_Encrypt function
134 // (https://bugzilla.mozilla.org/show_bug.cgi?id=854063), both of which are 94 // (https://bugzilla.mozilla.org/show_bug.cgi?id=854063), both of which are
135 // resolved in NSS 3.15. 95 // resolved in NSS 3.15.
136 96
137 DCHECK_EQ(mechanism, static_cast<CK_MECHANISM_TYPE>(CKM_AES_GCM)); 97 DCHECK_EQ(mechanism, static_cast<CK_MECHANISM_TYPE>(CKM_AES_GCM));
138 DCHECK_EQ(param->len, sizeof(CK_GCM_PARAMS)); 98 DCHECK_EQ(param->len, sizeof(CK_GCM_PARAMS));
139 99
140 if (max_len < static_cast<unsigned int>(Aes128Gcm12Encrypter::kAuthTagSize)) { 100 const CK_GCM_PARAMS* gcm_params =
141 DVLOG(1) << "max_len is less than kAuthTagSize"; 101 reinterpret_cast<CK_GCM_PARAMS*>(param->data);
102
103 const unsigned int auth_tag_size = gcm_params->ulTagBits / 8;
104 if (max_len < auth_tag_size) {
105 DVLOG(1) << "max_len is less than auth_tag_size";
142 PORT_SetError(SEC_ERROR_OUTPUT_LEN); 106 PORT_SetError(SEC_ERROR_OUTPUT_LEN);
143 return SECFailure; 107 return SECFailure;
144 } 108 }
145 109
146 const CK_GCM_PARAMS* gcm_params =
147 reinterpret_cast<CK_GCM_PARAMS*>(param->data);
148
149 DCHECK_EQ(gcm_params->ulTagBits,
150 static_cast<CK_ULONG>(Aes128Gcm12Encrypter::kAuthTagSize * 8));
151 if (gcm_params->ulIvLen != 12u) { 110 if (gcm_params->ulIvLen != 12u) {
152 DVLOG(1) << "ulIvLen is not equal to 12"; 111 DVLOG(1) << "ulIvLen is not equal to 12";
153 PORT_SetError(SEC_ERROR_INPUT_LEN); 112 PORT_SetError(SEC_ERROR_INPUT_LEN);
154 return SECFailure; 113 return SECFailure;
155 } 114 }
156 115
157 SECItem my_param = { siBuffer, NULL, 0 }; 116 SECItem my_param = { siBuffer, NULL, 0 };
158 117
159 // Step 1. Let H = CIPH_K(128 '0' bits). 118 // Step 1. Let H = CIPH_K(128 '0' bits).
160 unsigned char ghash_key[16] = {0}; 119 unsigned char ghash_key[16] = {0};
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 } 181 }
223 182
224 PK11_Finalize(ctx.get()); 183 PK11_Finalize(ctx.get());
225 184
226 if (static_cast<unsigned int>(output_len) != data_len) { 185 if (static_cast<unsigned int>(output_len) != data_len) {
227 DVLOG(1) << "Wrong output length"; 186 DVLOG(1) << "Wrong output length";
228 PORT_SetError(SEC_ERROR_LIBRARY_FAILURE); 187 PORT_SetError(SEC_ERROR_LIBRARY_FAILURE);
229 return SECFailure; 188 return SECFailure;
230 } 189 }
231 190
232 if ((max_len - Aes128Gcm12Encrypter::kAuthTagSize) < 191 if ((max_len - auth_tag_size) < static_cast<unsigned int>(output_len)) {
233 static_cast<unsigned int>(output_len)) { 192 DVLOG(1) << "(max_len - auth_tag_size) is less than output_len";
234 DVLOG(1) << "(max_len - kAuthTagSize) is less than output_len";
235 PORT_SetError(SEC_ERROR_OUTPUT_LEN); 193 PORT_SetError(SEC_ERROR_OUTPUT_LEN);
236 return SECFailure; 194 return SECFailure;
237 } 195 }
238 196
239 crypto::GaloisHash ghash(ghash_key); 197 crypto::GaloisHash ghash(ghash_key);
240 ghash.UpdateAdditional(gcm_params->pAAD, gcm_params->ulAADLen); 198 ghash.UpdateAdditional(gcm_params->pAAD, gcm_params->ulAADLen);
241 ghash.UpdateCiphertext(out, output_len); 199 ghash.UpdateCiphertext(out, output_len);
242 ghash.Finish(out + output_len, Aes128Gcm12Encrypter::kAuthTagSize); 200 ghash.Finish(out + output_len, auth_tag_size);
243 for (unsigned int i = 0; i < Aes128Gcm12Encrypter::kAuthTagSize; i++) { 201 for (unsigned int i = 0; i < auth_tag_size; i++) {
244 out[output_len + i] ^= tag_mask[i]; 202 out[output_len + i] ^= tag_mask[i];
245 } 203 }
246 204
247 *out_len = output_len + Aes128Gcm12Encrypter::kAuthTagSize; 205 *out_len = output_len + auth_tag_size;
248 return SECSuccess; 206 return SECSuccess;
249 } 207 }
250 208
251 } // namespace 209 } // namespace
252 210
253 Aes128Gcm12Encrypter::Aes128Gcm12Encrypter() { 211 AeadBaseEncrypter::AeadBaseEncrypter(CK_MECHANISM_TYPE aead_mechanism,
254 ignore_result(g_gcm_support_checker.Get()); 212 size_t key_size,
213 size_t auth_tag_size,
214 size_t nonce_prefix_size)
215 : aead_mechanism_(aead_mechanism),
216 key_size_(key_size),
217 auth_tag_size_(auth_tag_size),
218 nonce_prefix_size_(nonce_prefix_size) {
219 DCHECK_LE(key_size_, sizeof(key_));
220 DCHECK_LE(nonce_prefix_size_, sizeof(nonce_prefix_));
221 ignore_result(g_aead_support_checker.Get());
255 } 222 }
256 223
257 Aes128Gcm12Encrypter::~Aes128Gcm12Encrypter() {} 224 AeadBaseEncrypter::~AeadBaseEncrypter() {}
258 225
259 bool Aes128Gcm12Encrypter::SetKey(StringPiece key) { 226 bool AeadBaseEncrypter::SetKey(StringPiece key) {
260 DCHECK_EQ(key.size(), sizeof(key_)); 227 DCHECK_EQ(key.size(), key_size_);
261 if (key.size() != sizeof(key_)) { 228 if (key.size() != key_size_) {
262 return false; 229 return false;
263 } 230 }
264 memcpy(key_, key.data(), key.size()); 231 memcpy(key_, key.data(), key.size());
265 return true; 232 return true;
266 } 233 }
267 234
268 bool Aes128Gcm12Encrypter::SetNoncePrefix(StringPiece nonce_prefix) { 235 bool AeadBaseEncrypter::SetNoncePrefix(StringPiece nonce_prefix) {
269 DCHECK_EQ(nonce_prefix.size(), kNoncePrefixSize); 236 DCHECK_EQ(nonce_prefix.size(), nonce_prefix_size_);
270 if (nonce_prefix.size() != kNoncePrefixSize) { 237 if (nonce_prefix.size() != nonce_prefix_size_) {
271 return false; 238 return false;
272 } 239 }
273 COMPILE_ASSERT(sizeof(nonce_prefix_) == kNoncePrefixSize, bad_nonce_length);
274 memcpy(nonce_prefix_, nonce_prefix.data(), nonce_prefix.size()); 240 memcpy(nonce_prefix_, nonce_prefix.data(), nonce_prefix.size());
275 return true; 241 return true;
276 } 242 }
277 243
278 bool Aes128Gcm12Encrypter::Encrypt(StringPiece nonce, 244 bool AeadBaseEncrypter::Encrypt(StringPiece nonce,
279 StringPiece associated_data, 245 StringPiece associated_data,
280 StringPiece plaintext, 246 StringPiece plaintext,
281 unsigned char* output) { 247 unsigned char* output) {
282 if (nonce.size() != kNoncePrefixSize + sizeof(QuicPacketSequenceNumber)) { 248 if (nonce.size() != nonce_prefix_size_ + sizeof(QuicPacketSequenceNumber)) {
283 return false; 249 return false;
284 } 250 }
285 251
286 size_t ciphertext_size = GetCiphertextSize(plaintext.length()); 252 size_t ciphertext_size = GetCiphertextSize(plaintext.length());
287 253
288 // Import key_ into NSS. 254 // Import key_ into NSS.
289 SECItem key_item; 255 SECItem key_item;
290 key_item.type = siBuffer; 256 key_item.type = siBuffer;
291 key_item.data = key_; 257 key_item.data = key_;
292 key_item.len = sizeof(key_); 258 key_item.len = key_size_;
293 PK11SlotInfo* slot = PK11_GetInternalSlot(); 259 PK11SlotInfo* slot = PK11_GetInternalSlot();
260
261 // TODO(wtc): For an AES-GCM key, the correct value for |key_mechanism| is
262 // CKM_AES_GCM, but because of NSS bug
263 // https://bugzilla.mozilla.org/show_bug.cgi?id=853285, use CKM_AES_ECB as a
264 // workaround. Remove this when we require NSS 3.15.
265 CK_MECHANISM_TYPE key_mechanism = aead_mechanism_;
266 if (key_mechanism == CKM_AES_GCM) {
267 key_mechanism = CKM_AES_ECB;
268 }
269
294 // The exact value of the |origin| argument doesn't matter to NSS as long as 270 // The exact value of the |origin| argument doesn't matter to NSS as long as
295 // it's not PK11_OriginFortezzaHack, so we pass PK11_OriginUnwrap as a 271 // it's not PK11_OriginFortezzaHack, so we pass PK11_OriginUnwrap as a
296 // placeholder. 272 // placeholder.
297 crypto::ScopedPK11SymKey aes_key(PK11_ImportSymKey( 273 crypto::ScopedPK11SymKey aead_key(PK11_ImportSymKey(
298 slot, GcmSupportChecker::aes_key_mechanism(), PK11_OriginUnwrap, 274 slot, key_mechanism, PK11_OriginUnwrap, CKA_ENCRYPT, &key_item, NULL));
299 CKA_ENCRYPT, &key_item, NULL));
300 PK11_FreeSlot(slot); 275 PK11_FreeSlot(slot);
301 slot = NULL; 276 slot = NULL;
302 if (!aes_key) { 277 if (!aead_key) {
303 DVLOG(1) << "PK11_ImportSymKey failed"; 278 DVLOG(1) << "PK11_ImportSymKey failed";
304 return false; 279 return false;
305 } 280 }
306 281
307 CK_GCM_PARAMS gcm_params = {0}; 282 AeadParams aead_params = {0};
308 gcm_params.pIv = 283 FillAeadParams(nonce, associated_data, auth_tag_size_, &aead_params);
309 reinterpret_cast<CK_BYTE*>(const_cast<char*>(nonce.data()));
310 gcm_params.ulIvLen = nonce.size();
311 gcm_params.pAAD =
312 reinterpret_cast<CK_BYTE*>(const_cast<char*>(associated_data.data()));
313 gcm_params.ulAADLen = associated_data.size();
314 gcm_params.ulTagBits = kAuthTagSize * 8;
315 284
316 SECItem param; 285 SECItem param;
317 param.type = siBuffer; 286 param.type = siBuffer;
318 param.data = reinterpret_cast<unsigned char*>(&gcm_params); 287 param.data = reinterpret_cast<unsigned char*>(&aead_params.data);
319 param.len = sizeof(gcm_params); 288 param.len = aead_params.len;
320 289
321 unsigned int output_len; 290 unsigned int output_len;
322 if (My_Encrypt(aes_key.get(), CKM_AES_GCM, &param, 291 if (My_Encrypt(aead_key.get(), aead_mechanism_, &param,
323 output, &output_len, ciphertext_size, 292 output, &output_len, ciphertext_size,
324 reinterpret_cast<const unsigned char*>(plaintext.data()), 293 reinterpret_cast<const unsigned char*>(plaintext.data()),
325 plaintext.size()) != SECSuccess) { 294 plaintext.size()) != SECSuccess) {
326 DVLOG(1) << "My_Encrypt failed"; 295 DVLOG(1) << "My_Encrypt failed";
327 return false; 296 return false;
328 } 297 }
329 298
330 if (output_len != ciphertext_size) { 299 if (output_len != ciphertext_size) {
331 DVLOG(1) << "Wrong output length"; 300 DVLOG(1) << "Wrong output length";
332 return false; 301 return false;
333 } 302 }
334 303
335 return true; 304 return true;
336 } 305 }
337 306
338 QuicData* Aes128Gcm12Encrypter::EncryptPacket( 307 QuicData* AeadBaseEncrypter::EncryptPacket(
339 QuicPacketSequenceNumber sequence_number, 308 QuicPacketSequenceNumber sequence_number,
340 StringPiece associated_data, 309 StringPiece associated_data,
341 StringPiece plaintext) { 310 StringPiece plaintext) {
342 size_t ciphertext_size = GetCiphertextSize(plaintext.length()); 311 size_t ciphertext_size = GetCiphertextSize(plaintext.length());
343 scoped_ptr<char[]> ciphertext(new char[ciphertext_size]); 312 scoped_ptr<char[]> ciphertext(new char[ciphertext_size]);
344 313
345 // TODO(ianswett): Introduce a check to ensure that we don't encrypt with the 314 // TODO(ianswett): Introduce a check to ensure that we don't encrypt with the
346 // same sequence number twice. 315 // same sequence number twice.
347 uint8 nonce[kNoncePrefixSize + sizeof(sequence_number)]; 316 uint8 nonce[sizeof(nonce_prefix_) + sizeof(sequence_number)];
348 COMPILE_ASSERT(sizeof(nonce) == kAESNonceSize, bad_sequence_number_size); 317 const size_t nonce_size = nonce_prefix_size_ + sizeof(sequence_number);
349 memcpy(nonce, nonce_prefix_, kNoncePrefixSize); 318 DCHECK_LE(nonce_size, sizeof(nonce));
350 memcpy(nonce + kNoncePrefixSize, &sequence_number, sizeof(sequence_number)); 319 memcpy(nonce, nonce_prefix_, nonce_prefix_size_);
351 if (!Encrypt(StringPiece(reinterpret_cast<char*>(nonce), sizeof(nonce)), 320 memcpy(nonce + nonce_prefix_size_, &sequence_number, sizeof(sequence_number));
321 if (!Encrypt(StringPiece(reinterpret_cast<char*>(nonce), nonce_size),
352 associated_data, plaintext, 322 associated_data, plaintext,
353 reinterpret_cast<unsigned char*>(ciphertext.get()))) { 323 reinterpret_cast<unsigned char*>(ciphertext.get()))) {
354 return NULL; 324 return NULL;
355 } 325 }
356 326
357 return new QuicData(ciphertext.release(), ciphertext_size, true); 327 return new QuicData(ciphertext.release(), ciphertext_size, true);
358 } 328 }
359 329
360 size_t Aes128Gcm12Encrypter::GetKeySize() const { return kKeySize; } 330 size_t AeadBaseEncrypter::GetKeySize() const { return key_size_; }
361 331
362 size_t Aes128Gcm12Encrypter::GetNoncePrefixSize() const { 332 size_t AeadBaseEncrypter::GetNoncePrefixSize() const {
363 return kNoncePrefixSize; 333 return nonce_prefix_size_;
364 } 334 }
365 335
366 size_t Aes128Gcm12Encrypter::GetMaxPlaintextSize(size_t ciphertext_size) const { 336 size_t AeadBaseEncrypter::GetMaxPlaintextSize(size_t ciphertext_size) const {
367 return ciphertext_size - kAuthTagSize; 337 return ciphertext_size - auth_tag_size_;
368 } 338 }
369 339
370 // An AEAD_AES_128_GCM_12 ciphertext is exactly 12 bytes longer than its 340 size_t AeadBaseEncrypter::GetCiphertextSize(size_t plaintext_size) const {
371 // corresponding plaintext. 341 return plaintext_size + auth_tag_size_;
372 size_t Aes128Gcm12Encrypter::GetCiphertextSize(size_t plaintext_size) const {
373 return plaintext_size + kAuthTagSize;
374 } 342 }
375 343
376 StringPiece Aes128Gcm12Encrypter::GetKey() const { 344 StringPiece AeadBaseEncrypter::GetKey() const {
377 return StringPiece(reinterpret_cast<const char*>(key_), sizeof(key_)); 345 return StringPiece(reinterpret_cast<const char*>(key_), key_size_);
378 } 346 }
379 347
380 StringPiece Aes128Gcm12Encrypter::GetNoncePrefix() const { 348 StringPiece AeadBaseEncrypter::GetNoncePrefix() const {
349 if (nonce_prefix_size_ == 0) {
350 return StringPiece();
351 }
381 return StringPiece(reinterpret_cast<const char*>(nonce_prefix_), 352 return StringPiece(reinterpret_cast<const char*>(nonce_prefix_),
382 kNoncePrefixSize); 353 nonce_prefix_size_);
383 } 354 }
384 355
385 } // namespace net 356 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698