# HG changeset patch # User Matt Johnston # Date 1432051131 -28800 # Node ID 3a27b1a09d2efd6662a64e0e5bdd17a242a043ea # Parent 3a514fbb88eba1f2b85248c1867d9d7218eef0a2 sha256 hash diff -r 3a514fbb88eb -r 3a27b1a09d2e py/uploader.py --- a/py/uploader.py Tue May 19 15:07:57 2015 +0000 +++ b/py/uploader.py Tue May 19 23:58:51 2015 +0800 @@ -48,9 +48,9 @@ if self.server.test_mode(): D("Would upload %s to %s" % (js, config.UPDATE_URL)) return - js_enc = binascii.b2a_base64(zlib.compress(js.encode())) - mac = hmac.new(config.HMAC_KEY.encode(), js_enc, hashlib.sha1).hexdigest() - send_data = {'data': js_enc, 'hmac': mac} + js_enc = binascii.b2a_base64(zlib.compress(js.encode())).strip() + mac = hmac.new(config.HMAC_KEY.encode(), js_enc, hashlib.sha256).hexdigest() + send_data = {'data': js_enc.decode(), 'hmac': mac} r = yield from asyncio.wait_for(aiohttp.request('post', config.UPDATE_URL, data=send_data), 60) result = yield from asyncio.wait_for(r.text(), 60) if result != 'OK':