Skip to content

specify data encoding type 'binary' at hash#update #746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
3rd-Eden merged 1 commit into from
Jun 13, 2016
Merged

specify data encoding type 'binary' at hash#update #746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/WebSocket.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@ function initAsClient(address, protocols, options) {
// begin handshake
var key = new Buffer(options.value.protocolVersion + '-' + Date.now()).toString('base64');
var shasum = crypto.createHash('sha1');
shasum.update(key + '258EAFA5-E914-47DA-95CA-C5AB0DC85B11');
shasum.update(key + '258EAFA5-E914-47DA-95CA-C5AB0DC85B11', 'binary');
var expectedServerKey = shasum.digest('base64');

var agent = options.value.agent;
Expand Down
6 changes: 3 additions & 3 deletions lib/WebSocketServer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ function handleHybiUpgrade(req, socket, upgradeHead, cb) {
// calc key
var key = req.headers['sec-websocket-key'];
var shasum = crypto.createHash('sha1');
shasum.update(key + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11");
shasum.update(key + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11", 'binary');
key = shasum.digest('base64');

var headers = [
Expand Down Expand Up @@ -422,9 +422,9 @@ function handleHixieUpgrade(req, socket, upgradeHead, cb) {
n >> 24 & 0xFF,
n >> 16 & 0xFF,
n >> 8 & 0xFF,
n & 0xFF));
n & 0xFF), 'binary');
});
md5.update(nonce.toString('binary'));
md5.update(nonce.toString('binary'), 'binary');

socket.setTimeout(0);
socket.setNoDelay(true);
Expand Down
6 changes: 3 additions & 3 deletions test/testserver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function validServer(server, req, socket) {
// calc key
var key = req.headers['sec-websocket-key'];
var shasum = crypto.createHash('sha1');
shasum.update(key + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11");
shasum.update(key + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11", 'binary');
key = shasum.digest('base64');

var headers = [
Expand Down Expand Up @@ -113,7 +113,7 @@ function invalidRequestHandler(server, req, socket) {
// calc key
var key = req.headers['sec-websocket-key'];
var shasum = crypto.createHash('sha1');
shasum.update(key + "bogus");
shasum.update(key + "bogus", 'binary');
key = shasum.digest('base64');

var headers = [
Expand Down Expand Up @@ -142,7 +142,7 @@ function closeAfterConnectHandler(server, req, socket) {
// calc key
var key = req.headers['sec-websocket-key'];
var shasum = crypto.createHash('sha1');
shasum.update(key + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11");
shasum.update(key + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11", 'binary');
key = shasum.digest('base64');

var headers = [
Expand Down