diff options
| author | Shadab Zafar <dufferzafar0@gmail.com> | 2016-06-08 16:37:56 +0530 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2016-06-15 09:49:38 +0200 |
| commit | d9b940c21e7729da1b6a63d8e82cd3ad4a82f775 (patch) | |
| tree | bc2faa31a34bf7496174cabac402ed1c03c9d314 /netlib/websockets | |
| parent | 0f1aa2b78e1c22da16a482aedae4ed9800830007 (diff) | |
| download | mitmproxy-d9b940c21e7729da1b6a63d8e82cd3ad4a82f775.tar.gz mitmproxy-d9b940c21e7729da1b6a63d8e82cd3ad4a82f775.tar.bz2 mitmproxy-d9b940c21e7729da1b6a63d8e82cd3ad4a82f775.zip | |
Py3: websockets
Diffstat (limited to 'netlib/websockets')
| -rw-r--r-- | netlib/websockets/protocol.py | 4 |
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()) |