Updated to new gnupg-version 1.3 from isislovecruft

libcloudzec.py

@@ -138,7 +138,7 @@ def __init__(self, genMasterKey=False, notifyCallback=None, debug=False):
             raise Exception('You need to set a username in {}'.format(self.confFile))
         # Create gpg instance | needs to be defined before en/decrypting anything
         homedir = os.path.join(home, '.gnupg')
-        if gnupg.__version__.startswith('1.2'): # The „new“ version of GnuPG from isislovecruft on GitHub
+        if gnupg.__version__.startswith('1.3'): # The „new“ version of GnuPG from isislovecruft on GitHub
             binary = '/usr/bin/gpg2' # No symlinks allowed
             self.gpg = gnupg.GPG(binary=binary, homedir=homedir)
         else:   # „Old“ versions or other versions of GnuPG:
@@ -729,7 +729,7 @@ def encryptFile(self, pathIn, filename, passphrase, force=False):
         # Else encrypt it
         with open(pathIn, 'rb') as fIn:
             binary = None
-            if gnupg.__version__.startswith('1.2'): # The „new“ version of GnuPG from isislovecruft on GitHu
+            if gnupg.__version__.startswith('1.3'): # The „new“ version of GnuPG from isislovecruft on GitHub
                 binary = self.gpg.encrypt(fIn.read(), passphrase=passphrase, armor=False, encrypt=False, symmetric=True, always_trust=True, cipher_algo='AES256', compress_algo=self.compression)
             else:   # „Old“ versions or other versions of GnuPG:
                 binary = self.gpg.encrypt(fIn.read(), passphrase=passphrase, armor=False, symmetric=True, always_trust=True, recipients=None)
@@ -841,7 +841,7 @@ def syncKeysWithBoth(self, cleanup=False, keys=None):
                 with self.sftp.open(serverLogPath, 'w') as fOut:
                     data = json.dumps(targetKeys)
                     enc = None
-                    if gnupg.__version__.startswith('1.2'): # The „new“ version of GnuPG from isislovecruft on GitHub
+                    if gnupg.__version__.startswith('1.3'): # The „new“ version of GnuPG from isislovecruft on GitHub
                         enc = self.gpg.encrypt(data, passphrase=self.masterKey, armor=True, encrypt=False, symmetric=True, cipher_algo=self.encryption, compress_algo='ZIP')
                     else:   # „Old“ versions or other versions of GnuPG:
                         enc = self.gpg.encrypt(data, passphrase=self.masterKey, armor=True, symmetric=True, recipients=None)
@@ -926,7 +926,7 @@ def storeRemoteLog(self, log):
         with self.sftp.open(remoteLogPath, 'w') as fOut:
             data = json.dumps(log)
             enc = None
-            if gnupg.__version__.startswith('1.2'): # The „new“ version of GnuPG from isislovecruft on GitHub
+            if gnupg.__version__.startswith('1.3'): # The „new“ version of GnuPG from isislovecruft on GitHub
                 enc = self.gpg.encrypt(data, passphrase=self.masterKey, armor=True, encrypt=False, symmetric=True, cipher_algo=self.encryption, compress_algo='ZIP')
             else:   # „Old“ versions or other versions of GnuPG:
                 enc = self.gpg.encrypt(data, passphrase=self.masterKey, armor=True, symmetric=True, recipients=None)