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

Side by Side Diff: net/quic/core/crypto/quic_decrypter.cc

Issue 2340583002: Make DiversificationNonce a std::array (Closed)
Patch Set: Created 4 years, 3 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
« no previous file with comments | « net/quic/core/crypto/quic_decrypter.h ('k') | net/quic/core/quic_connection.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/core/crypto/quic_decrypter.h" 5 #include "net/quic/core/crypto/quic_decrypter.h"
6 6
7 #include "crypto/hkdf.h" 7 #include "crypto/hkdf.h"
8 #include "net/quic/core/crypto/aes_128_gcm_12_decrypter.h" 8 #include "net/quic/core/crypto/aes_128_gcm_12_decrypter.h"
9 #include "net/quic/core/crypto/chacha20_poly1305_decrypter.h" 9 #include "net/quic/core/crypto/chacha20_poly1305_decrypter.h"
10 #include "net/quic/core/crypto/crypto_protocol.h" 10 #include "net/quic/core/crypto/crypto_protocol.h"
(...skipping 15 matching lines...) Expand all
26 return new NullDecrypter(); 26 return new NullDecrypter();
27 default: 27 default:
28 LOG(FATAL) << "Unsupported algorithm: " << algorithm; 28 LOG(FATAL) << "Unsupported algorithm: " << algorithm;
29 return nullptr; 29 return nullptr;
30 } 30 }
31 } 31 }
32 32
33 // static 33 // static
34 void QuicDecrypter::DiversifyPreliminaryKey(StringPiece preliminary_key, 34 void QuicDecrypter::DiversifyPreliminaryKey(StringPiece preliminary_key,
35 StringPiece nonce_prefix, 35 StringPiece nonce_prefix,
36 DiversificationNonce nonce, 36 const DiversificationNonce& nonce,
37 size_t key_size, 37 size_t key_size,
38 size_t nonce_prefix_size, 38 size_t nonce_prefix_size,
39 string* out_key, 39 string* out_key,
40 string* out_nonce_prefix) { 40 string* out_nonce_prefix) {
41 crypto::HKDF hkdf(preliminary_key.as_string() + nonce_prefix.as_string(), 41 crypto::HKDF hkdf(preliminary_key.as_string() + nonce_prefix.as_string(),
42 StringPiece(nonce, kDiversificationNonceSize), 42 StringPiece(nonce.data(), nonce.size()),
43 "QUIC key diversification", 0, key_size, 0, 43 "QUIC key diversification", 0, key_size, 0,
44 nonce_prefix_size, 0); 44 nonce_prefix_size, 0);
45 *out_key = hkdf.server_write_key().as_string(); 45 *out_key = hkdf.server_write_key().as_string();
46 *out_nonce_prefix = hkdf.server_write_iv().as_string(); 46 *out_nonce_prefix = hkdf.server_write_iv().as_string();
47 } 47 }
48 48
49 } // namespace net 49 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/core/crypto/quic_decrypter.h ('k') | net/quic/core/quic_connection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698