Make backwards compatible with nacl 1.0.x

[securemail.git] / cryptonize.py

diff --git a/cryptonize.py b/cryptonize.py
index d375f2300b07b09d3299b9a783e6fc8e802fb133..7a598d32cfd77cb672415d30d908d76b31b84814 100644 (file)
--- a/cryptonize.py
+++ b/cryptonize.py
@@ -17,6 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with SecureMail.  If not, see <https://www.gnu.org/licenses/>.
 
 # You should have received a copy of the GNU General Public License
 # along with SecureMail.  If not, see <https://www.gnu.org/licenses/>.
 

+from nacl import __version__ as NACL_VERSION

 from nacl.secret import SecretBox
 from nacl.public import PrivateKey, Box
 from nacl.utils import random, EncryptedMessage
 from nacl.secret import SecretBox
 from nacl.public import PrivateKey, Box
 from nacl.utils import random, EncryptedMessage


@@ -31,7 +32,11 @@ class Cryptonize:
     def symmetric_encrypt(self, key, plain):
         skey = self.sanitize_key(key)
         box = SecretBox(skey)
     def symmetric_encrypt(self, key, plain):
         skey = self.sanitize_key(key)
         box = SecretBox(skey)

-        cipher = box.encrypt(plain)
+        if NACL_VERSION < "1.1.0":
+            nonce = random(SecretBox.NONCE_SIZE)
+            cipher = box.encrypt(plain, nonce)
+        else:
+            cipher = box.encrypt(plain)

         box = skey = None
         
         return cipher
         box = skey = None
         
         return cipher


@@ -45,13 +50,21 @@ class Cryptonize:
         return plain
         
     def asymmetric_encrypt(self, privkey, pubkey, plain):
         return plain
         
     def asymmetric_encrypt(self, privkey, pubkey, plain):

+        if not isinstance(plain, bytes):
+            plain = plain.encode('utf-8')

         box = Box(privkey, pubkey)
         box = Box(privkey, pubkey)

-        cipher = box.encrypt(plain)
+        if NACL_VERSION < "1.1.0":
+            nonce = random(Box.NONCE_SIZE)
+            cipher = box.encrypt(plain, nonce)
+        else:
+            cipher = box.encrypt(plain)

         box = None
         
         return cipher
         
     def asymmetric_decrypt(self, privkey, pubkey, cipher):
         box = None
         
         return cipher
         
     def asymmetric_decrypt(self, privkey, pubkey, cipher):

+        if not isinstance(cipher, bytes):
+            cipher = cipher.encode('utf-8')

         box = Box(privkey, pubkey)
         plain = box.decrypt(cipher)
         box = None
         box = Box(privkey, pubkey)
         plain = box.decrypt(cipher)
         box = None