decrypt should return binary

Fixes tgalal/yowsup#1613
Randl · Aug 22, 2016 · 44a86c6 · 44a86c6
1 parent 72f7c44
commit 44a86c6
Showing 1 changed file with 1 addition and 12 deletions.
diff --git a/axolotl/sessioncipher.py b/axolotl/sessioncipher.py
@@ -85,12 +85,6 @@ def decryptMsg(self, ciphertext, textMsg=True):
 
         self.sessionStore.storeSession(self.recipientId, self.deviceId, sessionRecord)
 
-        if sys.version_info >= (3,0) and textMsg:
-            try:
-                return plaintext.decode()
-            except UnicodeDecodeError as e:
-                logger.warn(e)
-
         return plaintext
 
     def decryptPkmsg(self, ciphertext, textMsg=True):
@@ -107,11 +101,6 @@ def decryptPkmsg(self, ciphertext, textMsg=True):
         if unsignedPreKeyId is not None:
             self.preKeyStore.removePreKey(unsignedPreKeyId)
 
-        if sys.version_info >= (3, 0) and textMsg:
-            try:
-                return plaintext.decode()
-            except UnicodeDecodeError as e:
-                logger.warn(e)
         return plaintext
 
     def decryptWithSessionRecord(self, sessionRecord, cipherText):
@@ -287,4 +276,4 @@ def encrypt(self, raw):
             raise
 
     def decrypt(self, enc):
-        return self.unpad(self.cipher.decrypt(enc))
+        return self.unpad(self.cipher.decrypt(enc))