diff options
author | Sam Roberts <vieuxtech@gmail.com> | 2019-01-16 11:12:30 -0800 |
---|---|---|
committer | Anna Henningsen <anna@addaleax.net> | 2019-01-29 00:27:42 +0100 |
commit | 46c5c3388d24615d8bcd887bb366d4171e99fdee (patch) | |
tree | 12ca4fef0e7df35ba0e2028cc7fd6cd3e08a81c3 /src/node_crypto.h | |
parent | dd317fc1c866297f5c91a14a8b26525b8120288f (diff) | |
download | android-node-v8-46c5c3388d24615d8bcd887bb366d4171e99fdee.tar.gz android-node-v8-46c5c3388d24615d8bcd887bb366d4171e99fdee.tar.bz2 android-node-v8-46c5c3388d24615d8bcd887bb366d4171e99fdee.zip |
src: in-source comments and minor TLS cleanups
Renamed some internal C++ methods and properties for consistency, and
commented SSL I/O.
- Rename waiting_new_session_ after is_waiting_new_session(), instead of
using reverse naming (new_session_wait_), and change "waiting" to
"awaiting".
- Make TLSWrap::ClearIn() return void, the value is never used.
- Fix a getTicketKeys() cut-n-paste error. Since it doesn't use the
arguments, remove them from the js wrapper.
- Remove call of setTicketKeys(getTicketKeys()), its a no-op.
PR-URL: https://github.com/nodejs/node/pull/25713
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'src/node_crypto.h')
-rw-r--r-- | src/node_crypto.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/node_crypto.h b/src/node_crypto.h index 1b950846a7..32b6188259 100644 --- a/src/node_crypto.h +++ b/src/node_crypto.h @@ -218,7 +218,7 @@ class SSLWrap { kind_(kind), next_sess_(nullptr), session_callbacks_(false), - new_session_wait_(false), + awaiting_new_session_(false), cert_cb_(nullptr), cert_cb_arg_(nullptr), cert_cb_running_(false) { @@ -234,7 +234,7 @@ class SSLWrap { inline void enable_session_callbacks() { session_callbacks_ = true; } inline bool is_server() const { return kind_ == kServer; } inline bool is_client() const { return kind_ == kClient; } - inline bool is_waiting_new_session() const { return new_session_wait_; } + inline bool is_awaiting_new_session() const { return awaiting_new_session_; } inline bool is_waiting_cert_cb() const { return cert_cb_ != nullptr; } protected: @@ -325,7 +325,7 @@ class SSLWrap { SSLSessionPointer next_sess_; SSLPointer ssl_; bool session_callbacks_; - bool new_session_wait_; + bool awaiting_new_session_; // SSL_set_cert_cb CertCb cert_cb_; |