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

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

Issue 1787453002: Switch "const StringPiece&" to just "StringPiece" in QUIC code. No functional change. Not flag prot… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@116566297
Patch Set: Remove const StringPiece& from _nss crypto files. Created 4 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
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/quic/crypto/chacha20_poly1305_decrypter.h" 5 #include "net/quic/crypto/chacha20_poly1305_decrypter.h"
6 6
7 #include <pk11pub.h> 7 #include <pk11pub.h>
8 8
9 using base::StringPiece; 9 using base::StringPiece;
10 10
(...skipping 11 matching lines...) Expand all
22 kKeySize, 22 kKeySize,
23 kAuthTagSize, 23 kAuthTagSize,
24 kNoncePrefixSize) { 24 kNoncePrefixSize) {
25 static_assert(kKeySize <= kMaxKeySize, "key size too big"); 25 static_assert(kKeySize <= kMaxKeySize, "key size too big");
26 static_assert(kNoncePrefixSize <= kMaxNoncePrefixSize, 26 static_assert(kNoncePrefixSize <= kMaxNoncePrefixSize,
27 "nonce prefix size too big"); 27 "nonce prefix size too big");
28 } 28 }
29 29
30 ChaCha20Poly1305Decrypter::~ChaCha20Poly1305Decrypter() {} 30 ChaCha20Poly1305Decrypter::~ChaCha20Poly1305Decrypter() {}
31 31
32 void ChaCha20Poly1305Decrypter::FillAeadParams( 32 void ChaCha20Poly1305Decrypter::FillAeadParams(StringPiece nonce,
33 StringPiece nonce, 33 StringPiece associated_data,
34 const StringPiece& associated_data, 34 size_t auth_tag_size,
35 size_t auth_tag_size, 35 AeadParams* aead_params) const {
36 AeadParams* aead_params) const {
37 aead_params->len = sizeof(aead_params->data.nss_aead_params); 36 aead_params->len = sizeof(aead_params->data.nss_aead_params);
38 CK_NSS_AEAD_PARAMS* nss_aead_params = &aead_params->data.nss_aead_params; 37 CK_NSS_AEAD_PARAMS* nss_aead_params = &aead_params->data.nss_aead_params;
39 nss_aead_params->pIv = 38 nss_aead_params->pIv =
40 reinterpret_cast<CK_BYTE*>(const_cast<char*>(nonce.data())); 39 reinterpret_cast<CK_BYTE*>(const_cast<char*>(nonce.data()));
41 nss_aead_params->ulIvLen = nonce.size(); 40 nss_aead_params->ulIvLen = nonce.size();
42 nss_aead_params->pAAD = 41 nss_aead_params->pAAD =
43 reinterpret_cast<CK_BYTE*>(const_cast<char*>(associated_data.data())); 42 reinterpret_cast<CK_BYTE*>(const_cast<char*>(associated_data.data()));
44 nss_aead_params->ulAADLen = associated_data.size(); 43 nss_aead_params->ulAADLen = associated_data.size();
45 nss_aead_params->ulTagLen = auth_tag_size; 44 nss_aead_params->ulTagLen = auth_tag_size;
46 } 45 }
47 46
48 const char* ChaCha20Poly1305Decrypter::cipher_name() const { 47 const char* ChaCha20Poly1305Decrypter::cipher_name() const {
49 // TODO(rtenneti): Use TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305 instead of 48 // TODO(rtenneti): Use TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305 instead of
50 // hard coded string. 49 // hard coded string.
51 // return TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305; 50 // return TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305;
52 return "ECDHE-RSA-CHACHA20-POLY1305"; 51 return "ECDHE-RSA-CHACHA20-POLY1305";
53 } 52 }
54 53
55 uint32_t ChaCha20Poly1305Decrypter::cipher_id() const { 54 uint32_t ChaCha20Poly1305Decrypter::cipher_id() const {
56 // TODO(rtenneti): when Chromium requires NSS 3.15.2 or later, use 55 // TODO(rtenneti): when Chromium requires NSS 3.15.2 or later, use
57 // TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305 instead of 0xCC13. 56 // TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305 instead of 0xCC13.
58 // "OR" 0x03000000 to match OpenSSL/BoringSSL implementations. 57 // "OR" 0x03000000 to match OpenSSL/BoringSSL implementations.
59 return 0x03000000 | 0xCC13; 58 return 0x03000000 | 0xCC13;
60 } 59 }
61 60
62 } // namespace net 61 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/crypto/chacha20_poly1305_decrypter.h ('k') | net/quic/crypto/curve25519_key_exchange.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698