aboutsummaryrefslogtreecommitdiffstats
path: root/netlib
diff options
context:
space:
mode:
Diffstat (limited to 'netlib')
-rw-r--r--netlib/websockets/protocol.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/netlib/websockets/protocol.py b/netlib/websockets/protocol.py
index c1b7be2c..af0eef7d 100644
--- a/netlib/websockets/protocol.py
+++ b/netlib/websockets/protocol.py
@@ -20,7 +20,7 @@ import os
import six
-from netlib import http
+from netlib import http, strutils
websockets_magic = b'258EAFA5-E914-47DA-95CA-C5AB0DC85B11'
VERSION = "13"
@@ -109,4 +109,4 @@ class WebsocketsProtocol(object):
@classmethod
def create_server_nonce(self, client_nonce):
- return base64.b64encode(hashlib.sha1(client_nonce + websockets_magic).digest())
+ return base64.b64encode(hashlib.sha1(strutils.always_bytes(client_nonce) + websockets_magic).digest())