From 3c1f05db842dd03375e74d44950932f702812f0e Mon Sep 17 00:00:00 2001 From: David Benjamin Date: Fri, 1 Dec 2017 17:28:03 -0500 Subject: [PATCH] Fix comment about cipher names. The comment is backwards. BoringSSL has SSL_CIPHER_standard_name, but because it is usually not available in OpenSSL, you have to do it manually. (The code in question is not compiled in BoringSSL.) Bug: none Change-Id: If294937afc75d0b0bd3107fd5c57a85c6252f188 Reviewed-on: https://webrtc-review.googlesource.com/28380 Commit-Queue: David Benjamin Reviewed-by: Taylor Brandstetter Cr-Commit-Position: refs/heads/master@{#21146} --- rtc_base/opensslstreamadapter.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/rtc_base/opensslstreamadapter.cc b/rtc_base/opensslstreamadapter.cc index 0d2d9006ba..52a0b77623 100644 --- a/rtc_base/opensslstreamadapter.cc +++ b/rtc_base/opensslstreamadapter.cc @@ -80,11 +80,8 @@ struct SslCipherMapEntry { #define DEFINE_CIPHER_ENTRY_SSL3(name) {SSL3_CK_##name, "TLS_"#name} #define DEFINE_CIPHER_ENTRY_TLS1(name) {TLS1_CK_##name, "TLS_"#name} -// There currently is no method available to get a RFC-compliant name for a -// cipher suite from BoringSSL, so we need to define the mapping manually here. -// This should go away once BoringSSL supports "SSL_CIPHER_standard_name" -// (as available in OpenSSL if compiled with tracing enabled) or a similar -// method. +// The "SSL_CIPHER_standard_name" function is only available in OpenSSL when +// compiled with tracing, so we need to define the mapping manually here. static const SslCipherMapEntry kSslCipherMap[] = { // TLS v1.0 ciphersuites from RFC2246. DEFINE_CIPHER_ENTRY_SSL3(RSA_RC4_128_SHA),