tls: Resolved lint errors.

taylorzane · Aug 22, 2017 · Aug 22, 2017 · Aug 22, 2017 · Aug 22, 2017 · Aug 22, 2017
commit 4880511a815964e2525dac0949cae1837aba4e7b
diff --git a/doc/api/tls.md b/doc/api/tls.md
@@ -920,7 +920,8 @@ changes:
     `ciphers` option. Additionally, it may be necessary to disable
     `rejectUnauthorized` if a client attempts to specify a certificate for the
     session.
-    * *Note*: `psk` must be a hexadecimal string, `identity` must use UTF-8 encoding.
+    * *Note*: `psk` must be a hexadecimal string,
+    `identity` must use UTF-8 encoding.
   * `NPNProtocols` {string[]|Buffer[]|Uint8Array[]|Buffer|Uint8Array}
     An array of strings, `Buffer`s or `Uint8Array`s, or a single `Buffer` or
     `Uint8Array` containing supported NPN protocols. `Buffer`s should have the
@@ -1211,7 +1212,8 @@ changes:
     a 16-byte HMAC key, and a 16-byte AES key. This can be used to accept TLS
     session tickets on multiple instances of the TLS server.
   * ...: Any [`tls.createSecureContext()`][] options can be provided. For
-    servers, the identity options (`pfx`, `key`/`cert` or `pskCallback`) are usually required.
+    servers, the identity options (`pfx`, `key`/`cert` or `pskCallback`)
+    are usually required.
 * `secureConnectionListener` {Function}
 
 Creates a new [`tls.Server`][]. The `secureConnectionListener`, if provided, is
@@ -1369,20 +1371,6 @@ changes:
   certificate from a connecting client. Only applies when `isServer` is `true`.
 * `rejectUnauthorized` {boolean} If not `false` a server automatically reject
   clients with invalid certificates. Only applies when `isServer` is `true`.
-* `pskCallback(hint)` {Function} When negotiating TLS-PSK, this optional
-   function is called with the identity hint provided by the server. If the
-   client should continue to negotiate PSK ciphers, the return value of this
-   function must be an object in the form `{psk: <string>, identity:
-   <string>}`.
-   * *Note*: PSK ciphers are disabled by default, and using
-   TLS-PSK thus requires explicitly specifying a cipher suite with the
-   `ciphers` option. Additionally, it may be necessary to disable
-   `rejectUnauthorized` if a client attempts to specify a certificate for the
-   session.
-   * *Note*: `psk` must be a hexadecimal string.
-* `pskIdentityHint`: {string} The identity hint to send to clients when
-  negotiating TLS-PSK.
-  * *Note*: Must use UTF-8 encoding.
 * `options`
   * `secureContext`: A TLS context object from [`tls.createSecureContext()`][]
   * `isServer`: If `true` the TLS socket will be instantiated in server-mode.

diff --git a/lib/_tls_common.js b/lib/_tls_common.js
@@ -25,10 +25,10 @@ const { parseCertString } = require('internal/tls');
 const { isArrayBufferView } = require('internal/util/types');
 const tls = require('tls');
 const {
+  ERR_ASSERTION,
   ERR_CRYPTO_CUSTOM_ENGINE_NOT_SUPPORTED,
   ERR_INVALID_ARG_TYPE
 } = require('internal/errors').codes;
-const Buffer = require('buffer').Buffer;
 
 const { SSL_OP_CIPHER_SERVER_PREFERENCE } = process.binding('constants').crypto;
 
@@ -165,7 +165,7 @@ exports.createSecureContext = function createSecureContext(options, context) {
   if (options.pskCallback && c.context.enablePskCallback) {
     if (typeof options.pskCallback !== 'function') {
       throw new ERR_INVALID_ARG_TYPE('pskCallback',
-                                 'function', options.pskCallback);
+                                     'function', options.pskCallback);
     }
 
     c.context.onpskexchange = (identity, maxPskLen, maxIdentLen) => {
@@ -181,8 +181,7 @@ exports.createSecureContext = function createSecureContext(options, context) {
           throw new ERR_INVALID_ARG_TYPE('psk', ['string']);
         }
         if (ret.psk.length / 2 > maxPskLen) {
-          throw new errors.RangeError(
-            'ERR_ASSERTION',
+          throw new ERR_ASSERTION(
             `Pre-shared key exceeds ${maxPskLen} bytes`
           );
         }
@@ -191,11 +190,10 @@ exports.createSecureContext = function createSecureContext(options, context) {
         if (maxIdentLen) {
           if (typeof ret.identity !== 'string') {
             throw new ERR_INVALID_ARG_TYPE('identity',
-                                       'string');
+                                           'string');
           }
           if (ret.identity.length > maxIdentLen) {
-            throw new errors.RangeError(
-              'ERR_ASSERTION',
+            throw new ERR_ASSERTION(
               `PSK identity exceeds ${maxIdentLen} bytes`
             );
           }

diff --git a/src/node_crypto.cc b/src/node_crypto.cc
@@ -68,7 +68,6 @@ using v8::DontDelete;
 using v8::EscapableHandleScope;
 using v8::Exception;
 using v8::External;
-using v8::False;
 using v8::Function;
 using v8::FunctionCallbackInfo;
 using v8::FunctionTemplate;
@@ -1397,7 +1396,7 @@ void SecureContext::SetPskIdentity(const FunctionCallbackInfo<Value>& args) {
     return wrap->env()->ThrowTypeError("Argument must be a string");
   }
 
-  String::Utf8Value identity(args[0]);
+  String::Utf8Value identity(args.GetIsolate(), args[0]);
   if (!SSL_CTX_use_psk_identity_hint(wrap->ctx_, *identity)) {
     return wrap->env()->ThrowError("Failed to set PSK identity hint");
   }
@@ -1559,7 +1558,7 @@ unsigned int SecureContext::PskClientCallback(SSL *ssl,
 
   Local<String> identity_str = identity_val.As<String>();
   size_t identity_len = identity_str->Length();
-  String::Utf8Value identity_buf(identity_str);
+  String::Utf8Value identity_buf(isolate, identity_str);
 
   CHECK_LE(identity_len, max_identity_len);
   memcpy(identity, *identity_buf, identity_len);

diff --git a/test/parallel/test-tls-psk-circuit.js b/test/parallel/test-tls-psk-circuit.js
@@ -87,12 +87,16 @@ function startTest(port) {
   doTestCase(0);
 }
 
+const DISCONNECT_MESSAGE =
+  'Client network socket disconnected before ' +
+  'secure TLS connection was established';
+
 process.on('exit', () => {
   assert.deepStrictEqual(clientResults, [
     'connect',
     'connect',
-    'Client network socket disconnected before secure TLS connection was established',
-    'Client network socket disconnected before secure TLS connection was established',
+    DISCONNECT_MESSAGE,
+    DISCONNECT_MESSAGE,
     'connect'
   ]);
   assert.deepStrictEqual(connectingIds, [

diff --git a/test/parallel/test-tls-psk-client.js b/test/parallel/test-tls-psk-client.js
@@ -14,7 +14,7 @@ const IDENTITY = 'Client_identity';  // Hardcoded by openssl
 
 const server = spawn(common.opensslCli, [
   's_server',
-  '-accept', 54323 /*common.PORT*/,
+  '-accept', 54323 /* common.PORT */,
   '-cipher', CIPHERS,
   '-psk', KEY,
   '-psk_hint', IDENTITY,
@@ -68,7 +68,7 @@ server.on('exit', (code) => {
 
 
 function startClient() {
-  const s = tls.connect(54323 /*common.PORT*/, {
+  const s = tls.connect(54323 /* common.PORT */, {
     ciphers: CIPHERS,
     rejectUnauthorized: false,
     pskCallback(hint) {

diff --git a/test/parallel/test-tls-psk-server.js b/test/parallel/test-tls-psk-server.js
@@ -74,4 +74,3 @@ server.listen(0, () => {
     server.close();
   }));
 });
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -74,4 +74,3 @@ server.listen(0, () => {
		server.close();
		}));
		});