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/test_tools/crypto_test_utils_openssl.cc

Issue 1908103002: Landing Recent QUIC changes until 4/15/2016 17:20 UTC (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix 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 unified diff | Download patch
« no previous file with comments | « net/quic/test_tools/crypto_test_utils.cc ('k') | net/quic/test_tools/mock_quic_dispatcher.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/test_tools/crypto_test_utils.h" 5 #include "net/quic/test_tools/crypto_test_utils.h"
6 6
7 #include <openssl/bn.h> 7 #include <openssl/bn.h>
8 #include <openssl/ec.h> 8 #include <openssl/ec.h>
9 #include <openssl/ecdsa.h> 9 #include <openssl/ecdsa.h>
10 #include <openssl/evp.h> 10 #include <openssl/evp.h>
11 #include <openssl/obj_mac.h> 11 #include <openssl/obj_mac.h>
12 #include <openssl/sha.h> 12 #include <openssl/sha.h>
13 13
14 #include <memory>
15
14 #include "crypto/openssl_util.h" 16 #include "crypto/openssl_util.h"
15 #include "crypto/scoped_openssl_types.h" 17 #include "crypto/scoped_openssl_types.h"
16 #include "crypto/secure_hash.h" 18 #include "crypto/secure_hash.h"
17 #include "net/quic/crypto/channel_id.h" 19 #include "net/quic/crypto/channel_id.h"
18 20
19 using base::StringPiece; 21 using base::StringPiece;
20 using std::string; 22 using std::string;
21 23
22 namespace net { 24 namespace net {
23 25
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 }; 158 };
157 159
158 // static 160 // static
159 ChannelIDSource* CryptoTestUtils::ChannelIDSourceForTesting() { 161 ChannelIDSource* CryptoTestUtils::ChannelIDSourceForTesting() {
160 return new TestChannelIDSource(); 162 return new TestChannelIDSource();
161 } 163 }
162 164
163 } // namespace test 165 } // namespace test
164 166
165 } // namespace net 167 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/test_tools/crypto_test_utils.cc ('k') | net/quic/test_tools/mock_quic_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698