summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSam Roberts <vieuxtech@gmail.com>2019-06-03 11:48:25 -0700
committerAnna Henningsen <anna@addaleax.net>2019-12-03 23:28:38 +0100
commita025c5a8745637aa5f6e06acab0c15461a920d8e (patch)
tree7efb124ee33c61471cd7012e674f0266c89eff5c /src
parentc0905b71adb55cbf98816dd993fec2d7c17ebbfe (diff)
downloadandroid-node-v8-a025c5a8745637aa5f6e06acab0c15461a920d8e.tar.gz
android-node-v8-a025c5a8745637aa5f6e06acab0c15461a920d8e.tar.bz2
android-node-v8-a025c5a8745637aa5f6e06acab0c15461a920d8e.zip
tls: expose IETF name for current cipher suite
OpenSSL has its own legacy names, but knowing the IETF name is useful when trouble-shooting, or looking for more information on the cipher. PR-URL: https://github.com/nodejs/node/pull/30637 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: David Carlier <devnexen@gmail.com> Reviewed-By: Yorkie Liu <yorkiefixer@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/env.h1
-rw-r--r--src/node_crypto.cc3
2 files changed, 4 insertions, 0 deletions
diff --git a/src/env.h b/src/env.h
index c25a03ea1e..b3f1243f77 100644
--- a/src/env.h
+++ b/src/env.h
@@ -351,6 +351,7 @@ constexpr size_t kFsStatsBufferLength =
V(sni_context_string, "sni_context") \
V(source_string, "source") \
V(stack_string, "stack") \
+ V(standard_name_string, "standardName") \
V(start_time_string, "startTime") \
V(status_string, "status") \
V(stdio_string, "stdio") \
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index 2d965bcbff..3f771793e2 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -2685,6 +2685,9 @@ void SSLWrap<Base>::GetCipher(const FunctionCallbackInfo<Value>& args) {
const char* cipher_name = SSL_CIPHER_get_name(c);
info->Set(context, env->name_string(),
OneByteString(args.GetIsolate(), cipher_name)).Check();
+ const char* cipher_standard_name = SSL_CIPHER_standard_name(c);
+ info->Set(context, env->standard_name_string(),
+ OneByteString(args.GetIsolate(), cipher_standard_name)).Check();
const char* cipher_version = SSL_CIPHER_get_version(c);
info->Set(context, env->version_string(),
OneByteString(args.GetIsolate(), cipher_version)).Check();