net/quic/crypto/chacha20_poly1305_encrypter_nss.cc - Issue 826973002: replace COMPILE_ASSERT with static_assert in net/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/quic/crypto/chacha20_poly1305_encrypter_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:

Index: net/quic/crypto/chacha20_poly1305_encrypter_nss.cc

diff --git a/net/quic/crypto/chacha20_poly1305_encrypter_nss.cc b/net/quic/crypto/chacha20_poly1305_encrypter_nss.cc

index 40cd896840c0ae269eadba2bd1f218ddbae8ccba..770088cb1deb374da0f525c896c66c9cffcf0577 100644

--- a/net/quic/crypto/chacha20_poly1305_encrypter_nss.cc

+++ b/net/quic/crypto/chacha20_poly1305_encrypter_nss.cc

@@ -48,9 +48,9 @@ void ChaCha20Poly1305Encrypter::FillAeadParams(StringPiece nonce,

ChaCha20Poly1305Encrypter::ChaCha20Poly1305Encrypter()

: AeadBaseEncrypter(CKM_NSS_CHACHA20_POLY1305, PK11_Encrypt, kKeySize,

kAuthTagSize, kNoncePrefixSize) {

- COMPILE_ASSERT(kKeySize <= kMaxKeySize, key_size_too_big);

- COMPILE_ASSERT(kNoncePrefixSize <= kMaxNoncePrefixSize,

- nonce_prefix_size_too_big);

+ static_assert(kKeySize <= kMaxKeySize, "key size too big");

+ static_assert(kNoncePrefixSize <= kMaxNoncePrefixSize,

+ "nonce prefix size too big");

}

ChaCha20Poly1305Encrypter::~ChaCha20Poly1305Encrypter() {}