summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAnna Henningsen <anna@addaleax.net>2017-03-22 07:42:04 +0100
committerAnna Henningsen <anna@addaleax.net>2017-03-27 02:08:49 +0200
commitc3efe726694907ce0b2e41546d84a9a94547383e (patch)
tree29c490bd046b4e29b9d1cd92d5d94df066800c9a /lib
parent2dc1053b0a6800ab7baf052017d37eaebf5e5a7e (diff)
downloadandroid-node-v8-c3efe726694907ce0b2e41546d84a9a94547383e.tar.gz
android-node-v8-c3efe726694907ce0b2e41546d84a9a94547383e.tar.bz2
android-node-v8-c3efe726694907ce0b2e41546d84a9a94547383e.zip
tls: support Uint8Arrays for protocol list buffers
PR-URL: https://github.com/nodejs/node/pull/11984 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/tls.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/tls.js b/lib/tls.js
index 9e092fe8bb..748ab6fefb 100644
--- a/lib/tls.js
+++ b/lib/tls.js
@@ -28,6 +28,7 @@ const net = require('net');
const url = require('url');
const binding = process.binding('crypto');
const Buffer = require('buffer').Buffer;
+const { isUint8Array } = process.binding('util');
// Allow {CLIENT_RENEG_LIMIT} client-initiated session renegotiations
// every {CLIENT_RENEG_WINDOW} seconds. An error event is emitted if more
@@ -71,7 +72,7 @@ exports.convertNPNProtocols = function(protocols, out) {
// If protocols is Array - translate it into buffer
if (Array.isArray(protocols)) {
out.NPNProtocols = convertProtocols(protocols);
- } else if (protocols instanceof Buffer) {
+ } else if (isUint8Array(protocols)) {
// Copy new buffer not to be modified by user.
out.NPNProtocols = Buffer.from(protocols);
}
@@ -81,7 +82,7 @@ exports.convertALPNProtocols = function(protocols, out) {
// If protocols is Array - translate it into buffer
if (Array.isArray(protocols)) {
out.ALPNProtocols = convertProtocols(protocols);
- } else if (protocols instanceof Buffer) {
+ } else if (isUint8Array(protocols)) {
// Copy new buffer not to be modified by user.
out.ALPNProtocols = Buffer.from(protocols);
}