aboutsummaryrefslogtreecommitdiff
path: root/src/node_crypto.cc
diff options
context:
space:
mode:
authorDavid Benjamin <davidben@google.com>2017-09-23 00:35:33 -0400
committerRod Vagg <rod@vagg.org>2017-11-11 20:42:49 +1100
commit5fe81c8aff03261f6443580dbc08f608013718c6 (patch)
tree3e2c18c42182d9cf6550881e623939dd68493249 /src/node_crypto.cc
parent594ef761d1c583a8ef6e49876a4a57aec4b62394 (diff)
downloadandroid-node-v8-5fe81c8aff03261f6443580dbc08f608013718c6.tar.gz
android-node-v8-5fe81c8aff03261f6443580dbc08f608013718c6.tar.bz2
android-node-v8-5fe81c8aff03261f6443580dbc08f608013718c6.zip
crypto: hard-code tlsSocket.getCipher().version
This aligns the documentation with reality. This API never did what Node claims it did. The SSL_CIPHER_get_version function just isn't useful. In OpenSSL 1.0.2, it always returned the string "TLSv1/SSLv3" for anything but SSLv2 ciphers, which Node does not support. Note how test-tls-multi-pfx.js claims that ECDHE-ECDSA-AES256-GCM-SHA384 was added in TLSv1/SSLv3 which is not true. That cipher is new as of TLS 1.2. The OpenSSL 1.0.2 implementation is: char *SSL_CIPHER_get_version(const SSL_CIPHER *c) { int i; if (c == NULL) return ("(NONE)"); i = (int)(c->id >> 24L); if (i == 3) return ("TLSv1/SSLv3"); else if (i == 2) return ("SSLv2"); else return ("unknown"); } In OpenSSL 1.1.0, SSL_CIPHER_get_version changed to actually behave as Node documented it, but this changes the semantics of the function and breaks tests. The cipher's minimum protocol version is not a useful notion to return to the caller here, so just hardcode the string at "TLSv1/SSLv3" and document it as legacy. PR-URL: https://github.com/nodejs/node/pull/16130 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Rod Vagg <rod@vagg.org>
Diffstat (limited to 'src/node_crypto.cc')
-rw-r--r--src/node_crypto.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
index c6c026aeef..90280ae7b7 100644
--- a/src/node_crypto.cc
+++ b/src/node_crypto.cc
@@ -2258,9 +2258,8 @@ void SSLWrap<Base>::GetCurrentCipher(const FunctionCallbackInfo<Value>& args) {
Local<Object> info = Object::New(env->isolate());
const char* cipher_name = SSL_CIPHER_get_name(c);
info->Set(env->name_string(), OneByteString(args.GetIsolate(), cipher_name));
- const char* cipher_version = SSL_CIPHER_get_version(c);
info->Set(env->version_string(),
- OneByteString(args.GetIsolate(), cipher_version));
+ OneByteString(args.GetIsolate(), "TLSv1/SSLv3"));
args.GetReturnValue().Set(info);
}