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

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

Issue 1535363003: Switch to standard integer types in net/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: stddef Created 5 years 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 nss_aead_params->ulTagLen = auth_tag_size; 45 nss_aead_params->ulTagLen = auth_tag_size;
46 } 46 }
47 47
48 const char* ChaCha20Poly1305Decrypter::cipher_name() const { 48 const char* ChaCha20Poly1305Decrypter::cipher_name() const {
49 // TODO(rtenneti): Use TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305 instead of 49 // TODO(rtenneti): Use TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305 instead of
50 // hard coded string. 50 // hard coded string.
51 // return TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305; 51 // return TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305;
52 return "ECDHE-RSA-CHACHA20-POLY1305"; 52 return "ECDHE-RSA-CHACHA20-POLY1305";
53 } 53 }
54 54
55 uint32 ChaCha20Poly1305Decrypter::cipher_id() const { 55 uint32_t ChaCha20Poly1305Decrypter::cipher_id() const {
56 // TODO(rtenneti): when Chromium requires NSS 3.15.2 or later, use 56 // TODO(rtenneti): when Chromium requires NSS 3.15.2 or later, use
57 // TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305 instead of 0xCC13. 57 // TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305 instead of 0xCC13.
58 // "OR" 0x03000000 to match OpenSSL/BoringSSL implementations. 58 // "OR" 0x03000000 to match OpenSSL/BoringSSL implementations.
59 return 0x03000000 | 0xCC13; 59 return 0x03000000 | 0xCC13;
60 } 60 }
61 61
62 } // namespace net 62 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/crypto/chacha20_poly1305_decrypter.h ('k') | net/quic/crypto/chacha20_poly1305_decrypter_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698