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

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

Issue 336273006: QUIC - cleanup changes to keep in sync with internal source tree. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 | Annotate | Revision Log
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/crypto/quic_crypto_client_config.h" 5 #include "net/quic/crypto/quic_crypto_client_config.h"
6 6
7 #include "base/stl_util.h" 7 #include "base/stl_util.h"
8 #include "base/strings/string_util.h" 8 #include "base/strings/string_util.h"
9 #include "net/quic/crypto/cert_compressor.h" 9 #include "net/quic/crypto/cert_compressor.h"
10 #include "net/quic/crypto/chacha20_poly1305_encrypter.h" 10 #include "net/quic/crypto/chacha20_poly1305_encrypter.h"
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after
580 *error_details = "Certificate missing"; 580 *error_details = "Certificate missing";
581 return QUIC_INVALID_CRYPTO_MESSAGE_PARAMETER; 581 return QUIC_INVALID_CRYPTO_MESSAGE_PARAMETER;
582 } 582 }
583 583
584 if (!has_proof && has_cert) { 584 if (!has_proof && has_cert) {
585 *error_details = "Proof missing"; 585 *error_details = "Proof missing";
586 return QUIC_INVALID_CRYPTO_MESSAGE_PARAMETER; 586 return QUIC_INVALID_CRYPTO_MESSAGE_PARAMETER;
587 } 587 }
588 } 588 }
589 589
590 const QuicTag* reject_reasons; 590 const uint32* reject_reasons;
wtc 2014/06/20 23:21:01 We should also COMPILE_ASSERT sizeof(QuicTag) == s
ramant (doing other things) 2014/06/20 23:33:25 Done.
591 size_t num_reject_reasons; 591 size_t num_reject_reasons;
592 if (rej.GetTaglist(kRREJ, &reject_reasons, 592 if (rej.GetTaglist(kRREJ, &reject_reasons,
593 &num_reject_reasons) == QUIC_NO_ERROR) { 593 &num_reject_reasons) == QUIC_NO_ERROR) {
594 #if defined(DEBUG) 594 #if defined(DEBUG)
595 for (size_t i = 0; i < num_reject_reasons; ++i) { 595 for (size_t i = 0; i < num_reject_reasons; ++i) {
596 DVLOG(1) << "Reasons for rejection: " << reject_reasons[i]; 596 DVLOG(1) << "Reasons for rejection: " << reject_reasons[i];
597 } 597 }
598 #endif 598 #endif
599 } 599 }
600 600
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
755 return; 755 return;
756 } 756 }
757 757
758 // Update canonical version to point at the "most recent" entry. 758 // Update canonical version to point at the "most recent" entry.
759 canonical_server_map_[suffix_server_id] = server_id; 759 canonical_server_map_[suffix_server_id] = server_id;
760 760
761 server_state->InitializeFrom(*canonical_state); 761 server_state->InitializeFrom(*canonical_state);
762 } 762 }
763 763
764 } // namespace net 764 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698