diff options
| author | Sam Roberts <vieuxtech@gmail.com> | 2019-03-12 12:09:24 -0700 |
|---|---|---|
| committer | Daniel Bevenius <daniel.bevenius@gmail.com> | 2019-03-18 07:34:16 +0100 |
| commit | 0f745bf9bde4e19dd352f10299d4365a4edaf386 (patch) | |
| tree | d315a734ab26965c38c09c85f74ad16ced06dd54 /src/node_crypto.h | |
| parent | 1ceb6d8e9b516052e21b1dabd1ab19e3c3488e1e (diff) | |
| download | android-node-v8-0f745bf9bde4e19dd352f10299d4365a4edaf386.tar.gz android-node-v8-0f745bf9bde4e19dd352f10299d4365a4edaf386.tar.bz2 android-node-v8-0f745bf9bde4e19dd352f10299d4365a4edaf386.zip | |
tls: return correct version from getCipher()
OpenSSL 1.0.0 returned incorrect version information. OpenSSL 1.1.0
fixed this, but returning the correct information broke our tests, so
was considered semver-major. Because of this, the version was hard-coded
to the OpenSSL 1.0.0 (incorrect) string in 5fe81c8aff03261.
This is ancient history, start returning the correct cipher version.
PR-URL: https://github.com/nodejs/node/pull/26625
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'src/node_crypto.h')
| -rw-r--r-- | src/node_crypto.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/node_crypto.h b/src/node_crypto.h index 1c66b318a2..a0551651fb 100644 --- a/src/node_crypto.h +++ b/src/node_crypto.h @@ -281,7 +281,7 @@ class SSLWrap { static void LoadSession(const v8::FunctionCallbackInfo<v8::Value>& args); static void IsSessionReused(const v8::FunctionCallbackInfo<v8::Value>& args); static void VerifyError(const v8::FunctionCallbackInfo<v8::Value>& args); - static void GetCurrentCipher(const v8::FunctionCallbackInfo<v8::Value>& args); + static void GetCipher(const v8::FunctionCallbackInfo<v8::Value>& args); static void EndParser(const v8::FunctionCallbackInfo<v8::Value>& args); static void CertCbDone(const v8::FunctionCallbackInfo<v8::Value>& args); static void Renegotiate(const v8::FunctionCallbackInfo<v8::Value>& args); |