fix python 3.4 compatibility

pyradius · Oct 19, 2019 · 9ba4876 · 9ba4876
1 parent 046cecc
commit 9ba4876
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pyrad/packet.py b/pyrad/packet.py
@@ -740,7 +740,7 @@ def VerifyChapPasswd(self, userpwd):
         challenge = self.authenticator
         if 'CHAP-Challenge' in self:
             challenge = self['CHAP-Challenge'][0]
-        return password == md5_constructor(b'%s%s%s' % (chapid, userpwd, challenge)).digest()
+        return password == md5_constructor(chapid + userpwd + challenge).digest()
 
     def VerifyAuthRequest(self):
         """Verify request authenticator.

diff --git a/pyrad/tools.py b/pyrad/tools.py
@@ -110,10 +110,10 @@ def EncodeAscendBinary(str):
             terms[key] = struct.pack('B', int(value))
 
     trailer = 8 * b'\x00'
-    result = b'%s%s%s\x00%s%s%s%s%s\x00%s%s%s%s\x00\x00' % (
-        terms['family'], terms['action'], terms['direction'], terms['src'],
-        terms['dst'], terms['srcl'], terms['dstl'], terms['proto'],
-        terms['sport'], terms['dport'], terms['sportq'], terms['dportq']) + trailer
+
+    result = b''.join((terms['family'], terms['action'], terms['direction'], b'\x00', 
+        terms['src'], terms['dst'], terms['srcl'], terms['dstl'], terms['proto'], b'\x00',
+        terms['sport'], terms['dport'], terms['sportq'], terms['dportq'], b'\x00\x00', trailer))
     return result