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

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

Issue 826973002: replace COMPILE_ASSERT with static_assert in net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: apply fixups Created 5 years, 11 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 #include "base/logging.h" 9 #include "base/logging.h"
10 10
(...skipping 30 matching lines...) Expand all
41 size_t auth_tag_size, 41 size_t auth_tag_size,
42 AeadParams* aead_params) const { 42 AeadParams* aead_params) const {
43 NOTIMPLEMENTED(); 43 NOTIMPLEMENTED();
44 } 44 }
45 45
46 #else // defined(USE_NSS) 46 #else // defined(USE_NSS)
47 47
48 ChaCha20Poly1305Decrypter::ChaCha20Poly1305Decrypter() 48 ChaCha20Poly1305Decrypter::ChaCha20Poly1305Decrypter()
49 : AeadBaseDecrypter(CKM_NSS_CHACHA20_POLY1305, PK11_Decrypt, kKeySize, 49 : AeadBaseDecrypter(CKM_NSS_CHACHA20_POLY1305, PK11_Decrypt, kKeySize,
50 kAuthTagSize, kNoncePrefixSize) { 50 kAuthTagSize, kNoncePrefixSize) {
51 COMPILE_ASSERT(kKeySize <= kMaxKeySize, key_size_too_big); 51 static_assert(kKeySize <= kMaxKeySize, "key size too big");
52 COMPILE_ASSERT(kNoncePrefixSize <= kMaxNoncePrefixSize, 52 static_assert(kNoncePrefixSize <= kMaxNoncePrefixSize,
53 nonce_prefix_size_too_big); 53 "nonce prefix size too big");
54 } 54 }
55 55
56 ChaCha20Poly1305Decrypter::~ChaCha20Poly1305Decrypter() {} 56 ChaCha20Poly1305Decrypter::~ChaCha20Poly1305Decrypter() {}
57 57
58 // static 58 // static
59 bool ChaCha20Poly1305Decrypter::IsSupported() { 59 bool ChaCha20Poly1305Decrypter::IsSupported() {
60 return true; 60 return true;
61 } 61 }
62 62
63 void ChaCha20Poly1305Decrypter::FillAeadParams(StringPiece nonce, 63 void ChaCha20Poly1305Decrypter::FillAeadParams(StringPiece nonce,
64 StringPiece associated_data, 64 StringPiece associated_data,
65 size_t auth_tag_size, 65 size_t auth_tag_size,
66 AeadParams* aead_params) const { 66 AeadParams* aead_params) const {
67 aead_params->len = sizeof(aead_params->data.nss_aead_params); 67 aead_params->len = sizeof(aead_params->data.nss_aead_params);
68 CK_NSS_AEAD_PARAMS* nss_aead_params = &aead_params->data.nss_aead_params; 68 CK_NSS_AEAD_PARAMS* nss_aead_params = &aead_params->data.nss_aead_params;
69 nss_aead_params->pIv = 69 nss_aead_params->pIv =
70 reinterpret_cast<CK_BYTE*>(const_cast<char*>(nonce.data())); 70 reinterpret_cast<CK_BYTE*>(const_cast<char*>(nonce.data()));
71 nss_aead_params->ulIvLen = nonce.size(); 71 nss_aead_params->ulIvLen = nonce.size();
72 nss_aead_params->pAAD = 72 nss_aead_params->pAAD =
73 reinterpret_cast<CK_BYTE*>(const_cast<char*>(associated_data.data())); 73 reinterpret_cast<CK_BYTE*>(const_cast<char*>(associated_data.data()));
74 nss_aead_params->ulAADLen = associated_data.size(); 74 nss_aead_params->ulAADLen = associated_data.size();
75 nss_aead_params->ulTagLen = auth_tag_size; 75 nss_aead_params->ulTagLen = auth_tag_size;
76 } 76 }
77 77
78 #endif // defined(USE_NSS) 78 #endif // defined(USE_NSS)
79 79
80 } // namespace net 80 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/crypto/aes_128_gcm_12_encrypter_openssl.cc ('k') | net/quic/crypto/chacha20_poly1305_decrypter_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698