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

Side by Side Diff: net/quic/core/quic_crypto_server_stream.cc

Issue 2603723002: Add a new QUIC platform API for text utilities. (Closed)
Patch Set: Tests Created 3 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:
View unified diff | Download patch
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/quic_crypto_server_stream.h" 5 #include "net/quic/core/quic_crypto_server_stream.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "crypto/secure_hash.h" 10 #include "crypto/secure_hash.h"
11 #include "net/quic/core/crypto/crypto_protocol.h" 11 #include "net/quic/core/crypto/crypto_protocol.h"
12 #include "net/quic/core/crypto/crypto_utils.h" 12 #include "net/quic/core/crypto/crypto_utils.h"
13 #include "net/quic/core/crypto/quic_crypto_server_config.h" 13 #include "net/quic/core/crypto/quic_crypto_server_config.h"
14 #include "net/quic/core/crypto/quic_random.h" 14 #include "net/quic/core/crypto/quic_random.h"
15 #include "net/quic/core/proto/cached_network_parameters.pb.h" 15 #include "net/quic/core/proto/cached_network_parameters.pb.h"
16 #include "net/quic/core/quic_config.h" 16 #include "net/quic/core/quic_config.h"
17 #include "net/quic/core/quic_flags.h" 17 #include "net/quic/core/quic_flags.h"
18 #include "net/quic/core/quic_packets.h" 18 #include "net/quic/core/quic_packets.h"
19 #include "net/quic/core/quic_session.h" 19 #include "net/quic/core/quic_session.h"
20 #include "net/quic/platform/api/quic_text_utils.h"
20 21
21 using base::StringPiece; 22 using base::StringPiece;
22 using std::string; 23 using std::string;
23 24
24 namespace net { 25 namespace net {
25 26
26 class QuicCryptoServerStream::ProcessClientHelloCallback 27 class QuicCryptoServerStream::ProcessClientHelloCallback
27 : public ProcessClientHelloResultCallback { 28 : public ProcessClientHelloResultCallback {
28 public: 29 public:
29 ProcessClientHelloCallback( 30 ProcessClientHelloCallback(
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 return false; 415 return false;
415 } 416 }
416 417
417 const string& channel_id(crypto_negotiated_params_->channel_id); 418 const string& channel_id(crypto_negotiated_params_->channel_id);
418 std::unique_ptr<crypto::SecureHash> hash( 419 std::unique_ptr<crypto::SecureHash> hash(
419 crypto::SecureHash::Create(crypto::SecureHash::SHA256)); 420 crypto::SecureHash::Create(crypto::SecureHash::SHA256));
420 hash->Update(channel_id.data(), channel_id.size()); 421 hash->Update(channel_id.data(), channel_id.size());
421 uint8_t digest[32]; 422 uint8_t digest[32];
422 hash->Finish(digest, sizeof(digest)); 423 hash->Finish(digest, sizeof(digest));
423 424
424 base::Base64Encode( 425 QuicTextUtils::Base64Encode(digest, arraysize(digest), output);
425 string(reinterpret_cast<const char*>(digest), sizeof(digest)), output);
426 // Remove padding.
427 size_t len = output->size();
428 if (len >= 2) {
429 if ((*output)[len - 1] == '=') {
430 len--;
431 if ((*output)[len - 1] == '=') {
432 len--;
433 }
434 output->resize(len);
Jana 2016/12/27 23:52:48 Why's this resize not required anymore?
Ryan Hamilton 2016/12/28 01:48:38 All of this logic has moved into the new QuicTextU
435 }
436 }
437 return true; 426 return true;
438 } 427 }
439 428
440 void QuicCryptoServerStream::ProcessClientHello( 429 void QuicCryptoServerStream::ProcessClientHello(
441 QuicReferenceCountedPointer<ValidateClientHelloResultCallback::Result> 430 QuicReferenceCountedPointer<ValidateClientHelloResultCallback::Result>
442 result, 431 result,
443 std::unique_ptr<ProofSource::Details> proof_source_details, 432 std::unique_ptr<ProofSource::Details> proof_source_details,
444 std::unique_ptr<ProcessClientHelloResultCallback> done_cb) { 433 std::unique_ptr<ProcessClientHelloResultCallback> done_cb) {
445 const CryptoHandshakeMessage& message = result->client_hello; 434 const CryptoHandshakeMessage& message = result->client_hello;
446 string error_details; 435 string error_details;
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 QuicConnectionId QuicCryptoServerStream::GenerateConnectionIdForReject( 489 QuicConnectionId QuicCryptoServerStream::GenerateConnectionIdForReject(
501 bool use_stateless_rejects) { 490 bool use_stateless_rejects) {
502 if (!use_stateless_rejects) { 491 if (!use_stateless_rejects) {
503 return 0; 492 return 0;
504 } 493 }
505 return helper_->GenerateConnectionIdForReject( 494 return helper_->GenerateConnectionIdForReject(
506 session()->connection()->connection_id()); 495 session()->connection()->connection_id());
507 } 496 }
508 497
509 } // namespace net 498 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698