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

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

Issue 1844813002: Uprev NSS to 3.23 on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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_encrypter.h" 5 #include "net/quic/crypto/chacha20_poly1305_encrypter.h"
6 6
7 #include <pk11pub.h> 7 #include <pk11pub.h>
8 8
9 using base::StringPiece; 9 using base::StringPiece;
10 10
(...skipping 17 matching lines...) Expand all
28 } 28 }
29 29
30 ChaCha20Poly1305Encrypter::~ChaCha20Poly1305Encrypter() {} 30 ChaCha20Poly1305Encrypter::~ChaCha20Poly1305Encrypter() {}
31 31
32 void ChaCha20Poly1305Encrypter::FillAeadParams(StringPiece nonce, 32 void ChaCha20Poly1305Encrypter::FillAeadParams(StringPiece nonce,
33 StringPiece associated_data, 33 StringPiece associated_data,
34 size_t auth_tag_size, 34 size_t auth_tag_size,
35 AeadParams* aead_params) const { 35 AeadParams* aead_params) const {
36 aead_params->len = sizeof(aead_params->data.nss_aead_params); 36 aead_params->len = sizeof(aead_params->data.nss_aead_params);
37 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;
38 nss_aead_params->pIv = 38 nss_aead_params->pNonce =
39 reinterpret_cast<CK_BYTE*>(const_cast<char*>(nonce.data())); 39 reinterpret_cast<CK_BYTE*>(const_cast<char*>(nonce.data()));
40 nss_aead_params->ulIvLen = nonce.size(); 40 nss_aead_params->ulNonceLen = nonce.size();
41 nss_aead_params->pAAD = 41 nss_aead_params->pAAD =
42 reinterpret_cast<CK_BYTE*>(const_cast<char*>(associated_data.data())); 42 reinterpret_cast<CK_BYTE*>(const_cast<char*>(associated_data.data()));
43 nss_aead_params->ulAADLen = associated_data.size(); 43 nss_aead_params->ulAADLen = associated_data.size();
44 nss_aead_params->ulTagLen = auth_tag_size; 44 nss_aead_params->ulTagLen = auth_tag_size;
45 } 45 }
46 46
47 } // namespace net 47 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698