CryptedFileKeyring is not a BasicFileKeyring.

Update the test suite and derive CryptedFileKeyring from KeyringBackend since
CryptedFileKeyring provides the same interface as BasicFileKeyring except the
encrypt and decrypt methods.

The passwords are now encoded as base64 in the ini file. Otherwise passwords
containing special characters may produce problems.

keyring/backend.py

@@ -436,11 +436,26 @@ def supported(self):
         """
         return 0
 
-class CryptedFileKeyring(BasicFileKeyring):
+class CryptedFileKeyring(KeyringBackend):
     """PyCrypto File Keyring"""
 
+    @properties.NonDataProperty
+    def file_path(self):
+        """
+        The path to the file where passwords are stored. This property
+        may be overridden by the subclass or at the instance level.
+        """
+        return os.path.join(keyring.util.platform.data_root(), self.filename)
+
     filename = 'crypted_pass.cfg'
 
+    def _relocate_file(self):
+        old_location = os.path.join(os.path.expanduser('~'), self.filename)
+        new_location = self.file_path
+        keyring.util.loc_compat.relocate_file(old_location, new_location)
+        # disable this function - it only needs to be run once
+        self._relocate_file = lambda: None
+
     def supported(self):
         """Applicable for all platforms, but not recommend"
         """
@@ -537,7 +552,7 @@ def _convert_old_keyring(self, keyring_password=None):
             for opt in config.options(section):
                 cipher = AES.new(password, AES.MODE_CFB, '\0' * AES.block_size)
                 p = config.get(section, opt).decode()
-                p = cipher.decrypt(p.decode('base64'))
+                p = cipher.decrypt(p.decode('base64')).encode('base64').replace('\n','')
                 config.set(section, opt, p)
 
         self._write_config(config, keyring_password)
@@ -593,7 +608,7 @@ def get_password(self, service, username):
         # fetch the password
         try:
             password = config.get(service, username)
-            password = password.decode('utf-8')
+            password = password.decode('base64').decode('utf-8')
         except (ConfigParser.NoOptionError, ConfigParser.NoSectionError):
             password = None
         return password
@@ -608,7 +623,7 @@ def set_password(self, service, username, password):
 
         config, keyring_password = self._read_config()
 
-        password = password.encode('utf-8')
+        password = password.encode('utf-8').encode('base64').replace('\n','')
         # write the modification
         if not config.has_section(service):
             config.add_section(service)

keyring/tests/test_backend.py

@@ -111,7 +111,8 @@ def is_kwallet_supported():
 def is_crypto_supported():
     try:
         __import__('Crypto.Cipher.AES')
-        __import__('crypt')
+        __import__('Crypto.Protocol.KDF')
+        __import__('Crypto.Random')
     except ImportError:
         return False
     return True
@@ -370,6 +371,9 @@ def setUp(self):
     def init_keyring(self):
         return keyring.backend.CryptedFileKeyring()
 
+    def test_encrypt_decrypt(self):
+        pass
+
 
 @unittest.skipUnless(is_win32_crypto_supported(),
                      "Need Windows")