diff options
| author | guoweis <guoweis@webrtc.org> | 2015-09-30 19:23:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-01 02:23:15 +0000 |
| commit | 27dc29b0df23eed5034f28d4d5f66ea0bb425d6c (patch) | |
| tree | bec660229797e4b56b6847e9d023dd444120fde2 /talk/app/webrtc/statscollector_unittest.cc | |
| parent | 4fe3c9a77386598db9abd1f0d6983aefee9cc943 (diff) | |
| download | webrtc-27dc29b0df23eed5034f28d4d5f66ea0bb425d6c.tar.gz | |
Revert of Change WebRTC SslCipher to be exposed as number only. (patchset #20 id:750001 of https://codereview.webrtc.org/1337673002/ )
Reason for revert:
This broke chromium.fyi bot.
Original issue's description:
> Change WebRTC SslCipher to be exposed as number only.
>
> This makes the SSL exposed as uint16_t which is the IANA value. GetRfcSslCipherName is introduced to handle the conversion to names from ID. IANA value will be used for UMA reporting. Names will still be used for WebRTC stats reporting.
>
> For SRTP, currently it's still string internally but is reported as IANA number.
>
> This is used by the ongoing CL https://codereview.chromium.org/1335023002.
>
> BUG=523033
>
> Committed: https://crrev.com/4fe3c9a77386598db9abd1f0d6983aefee9cc943
> Cr-Commit-Position: refs/heads/master@{#10124}
TBR=juberti@webrtc.org,rsleevi@chromium.org,pthatcher@webrtc.org,davidben@chromium.org,juberti@google.com,davidben@webrtc.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=523033
Review URL: https://codereview.webrtc.org/1380603005
Cr-Commit-Position: refs/heads/master@{#10125}
Diffstat (limited to 'talk/app/webrtc/statscollector_unittest.cc')
| -rw-r--r-- | talk/app/webrtc/statscollector_unittest.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/talk/app/webrtc/statscollector_unittest.cc b/talk/app/webrtc/statscollector_unittest.cc index 5e658680be..7c055f6566 100644 --- a/talk/app/webrtc/statscollector_unittest.cc +++ b/talk/app/webrtc/statscollector_unittest.cc @@ -59,11 +59,6 @@ using webrtc::PeerConnectionInterface; using webrtc::StatsReport; using webrtc::StatsReports; -namespace { -// This value comes from openssl/tls1.h -const uint16_t TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA = 0xC014; -} // namespace - namespace cricket { class ChannelManager; @@ -652,7 +647,7 @@ class StatsCollectorTest : public testing::Test { cricket::TransportChannelStats channel_stats; channel_stats.component = 1; channel_stats.srtp_cipher = "the-srtp-cipher"; - channel_stats.ssl_cipher = TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA; + channel_stats.ssl_cipher = "the-ssl-cipher"; cricket::TransportStats transport_stats; transport_stats.transport_name = "audio"; @@ -721,9 +716,7 @@ class StatsCollectorTest : public testing::Test { StatsReport::kStatsReportTypeComponent, reports, StatsReport::kStatsValueNameDtlsCipher); - EXPECT_EQ(rtc::SSLStreamAdapter::GetSslCipherSuiteName( - TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA), - dtls_cipher); + EXPECT_EQ("the-ssl-cipher", dtls_cipher); std::string srtp_cipher = ExtractStatsValue( StatsReport::kStatsReportTypeComponent, reports, |