Skip to content

Commit eec05bf

Browse files
Cyber1000rgerganov
authored andcommitted
changed .hex() to binascii.hexlify() to stay compatible with python 3.4
1 parent 3bcee04 commit eec05bf

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
language: python
22
python:
3+
- "3.4"
34
- "3.5"
45
- "3.6"
56
- "3.7"

pyairctrl/coap_client.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def _encrypt_payload(self, payload):
106106
self._update_client_key()
107107
aes = self._handle_AES(self.client_key)
108108
paded_message = pad(bytes(payload.encode("utf8")), 16, style="pkcs7")
109-
encoded_message = aes.encrypt(paded_message).hex().upper()
109+
encoded_message = binascii.hexlify(aes.encrypt(paded_message)).decode("utf8").upper()
110110
digest = self._create_digest(self.client_key, encoded_message)
111111
return self.client_key + encoded_message + digest
112112

testing/coap_resources.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import os
33
import json
44
import hashlib
5+
import binascii
56
from Cryptodome.Cipher import AES
67
from Cryptodome.Util.Padding import pad, unpad
78
from coapthon.resources.resource import Resource
@@ -81,7 +82,7 @@ def render_GET_advanced(self, request, response):
8182
def _encrypt_payload(self, payload):
8283
aes = self._handle_AES(self.encryption_key)
8384
paded_message = pad(bytes(payload.encode("utf8")), 16, style="pkcs7")
84-
encoded_message = aes.encrypt(paded_message).hex().upper()
85+
encoded_message = binascii.hexlify(aes.encrypt(paded_message)).decode("utf8").upper()
8586
digest = self._create_digest(self.encryption_key, encoded_message)
8687
return self.encryption_key + encoded_message + digest
8788

testing/http_test_controller.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import json
55
import random
66
import os
7+
import binascii
78
import flask
89
from Cryptodome.Cipher import AES
910
from Cryptodome.Util.Padding import pad, unpad
@@ -75,7 +76,10 @@ def security(self):
7576
session_key_encrypted = self._encrypt(self._device_key, s_bytes)
7677

7778
data = json.dumps(
78-
{"key": session_key_encrypted.hex(), "hellman": format(B, "x")}
79+
{
80+
"key": binascii.hexlify(session_key_encrypted).decode("utf8"),
81+
"hellman": format(B, "x"),
82+
}
7983
)
8084
data_enc = data.encode("ascii")
8185

0 commit comments

Comments
 (0)