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

Unified Diff: net/quic/crypto/chacha20_poly1305_encrypter_nss.cc

Issue 1854273002: Remove the non-RFC 7539 variants of ChaCha20Poly1305 crypters in QUIC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: include 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 side-by-side diff with in-line comments
Download patch
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
deleted file mode 100644
index 9b0e9bfb3d8b810d9ae537fa7c092aa407b3e31c..0000000000000000000000000000000000000000
--- a/net/quic/crypto/chacha20_poly1305_encrypter_nss.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "net/quic/crypto/chacha20_poly1305_encrypter.h"
-
-#include <pk11pub.h>
-
-using base::StringPiece;
-
-namespace net {
-
-namespace {
-
-const size_t kKeySize = 32;
-const size_t kNoncePrefixSize = 0;
-
-} // namespace
-
-ChaCha20Poly1305Encrypter::ChaCha20Poly1305Encrypter()
- : AeadBaseEncrypter(CKM_NSS_CHACHA20_POLY1305,
- kKeySize,
- kAuthTagSize,
- kNoncePrefixSize) {
- static_assert(kKeySize <= kMaxKeySize, "key size too big");
- static_assert(kNoncePrefixSize <= kMaxNoncePrefixSize,
- "nonce prefix size too big");
-}
-
-ChaCha20Poly1305Encrypter::~ChaCha20Poly1305Encrypter() {}
-
-void ChaCha20Poly1305Encrypter::FillAeadParams(StringPiece nonce,
- StringPiece associated_data,
- size_t auth_tag_size,
- AeadParams* aead_params) const {
- aead_params->len = sizeof(aead_params->data.nss_aead_params);
- CK_NSS_AEAD_PARAMS* nss_aead_params = &aead_params->data.nss_aead_params;
- nss_aead_params->pIv =
- reinterpret_cast<CK_BYTE*>(const_cast<char*>(nonce.data()));
- nss_aead_params->ulIvLen = nonce.size();
- nss_aead_params->pAAD =
- reinterpret_cast<CK_BYTE*>(const_cast<char*>(associated_data.data()));
- nss_aead_params->ulAADLen = associated_data.size();
- nss_aead_params->ulTagLen = auth_tag_size;
-}
-
-} // namespace net
« no previous file with comments | « net/quic/crypto/chacha20_poly1305_decrypter_test.cc ('k') | net/quic/crypto/chacha20_poly1305_encrypter_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698