From e5e1e7c0cbb92e7d1cefe334136c0a7328720a01 Mon Sep 17 00:00:00 2001
From: Devendra
Date: Wed, 26 Nov 2014 04:13:44 +0530
Subject: return plain text on decryption error

---
 Pubnub.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'Pubnub.py')

diff --git a/Pubnub.py b/Pubnub.py
index 4a53eb1..83d243e 100644
--- a/Pubnub.py
+++ b/Pubnub.py
@@ -215,10 +215,13 @@ class PubnubCrypto2():
 
     def decrypt(self, key, msg):
 
-        secret = self.getSecret(key)
-        Initial16bytes = '0123456789012345'
-        cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes)
-        plain = self.depad(cipher.decrypt(decodestring(msg)))
+        try:
+            secret = self.getSecret(key)
+            Initial16bytes = '0123456789012345'
+            cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes)
+            plain = self.depad(cipher.decrypt(decodestring(msg)))
+        except:
+            return msg
         try:
             return eval(plain)
         except SyntaxError:
-- 
cgit v1.2.3