diff options
author | David Benjamin <davidben@google.com> | 2017-06-21 21:07:04 -0400 |
---|---|---|
committer | CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> | 2017-06-22 02:45:37 +0000 |
commit | 6fff386492d9f316f5f780ff9d0ddaf1700f98a9 (patch) | |
tree | 5885c6a7cef196c20ebebb175663240580d1ddb5 /tool/ciphers.cc | |
parent | cd60bf0e0a5a710a90d68a7496ef9540305bfd32 (diff) | |
download | boringssl-6fff386492d9f316f5f780ff9d0ddaf1700f98a9.zip boringssl-6fff386492d9f316f5f780ff9d0ddaf1700f98a9.tar.gz boringssl-6fff386492d9f316f5f780ff9d0ddaf1700f98a9.tar.bz2 |
Support standard RFC cipher suite names alongside OpenSSL ones.
Both Conscrypt and Netty have a lot of logic to map between the two
kinds of names. WebRTC needed an SSL_CIPHER_get_rfc_name for something.
Just have both in the library. Also deprecate SSL_CIPHER_get_rfc_name
in favor of SSL_CIPHER_standard_name, which matches upstream if built
with enable-ssl-trace. And, unlike SSL_CIPHER_get_rfc_name, this does
not require dealing with the malloc.
(Strangely this decreases bssl's binary size, even though we're carrying
more strings around. It seems the old SSL_CIPHER_get_rfc_name was
somewhat large in comparison. Regardless, a consumer that disliked 30
short strings probably also disliked the OpenSSL names. That would be
better solved by opaquifying SSL_CIPHER and adding a less stringy API
for configuring cipher lists. That's something we can explore later if
needed.)
I also made the command-line tool print out the standard names since
they're more standard. May as well push folks towards those going
forward.
Change-Id: Ieeb3d63e67ef4da87458e68d130166a4c1090596
Reviewed-on: https://boringssl-review.googlesource.com/17324
Reviewed-by: Robert Sloan <varomodt@google.com>
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: Adam Langley <agl@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
Diffstat (limited to 'tool/ciphers.cc')
-rw-r--r-- | tool/ciphers.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tool/ciphers.cc b/tool/ciphers.cc index 6370b78..3a7e23d 100644 --- a/tool/ciphers.cc +++ b/tool/ciphers.cc @@ -52,7 +52,7 @@ bool Ciphers(const std::vector<std::string> &args) { printf(" "); } - printf("%s\n", SSL_CIPHER_get_name(cipher)); + printf("%s\n", SSL_CIPHER_standard_name(cipher)); if (!in_group && last_in_group) { printf("]\n"); |