comparison easyhg.py @ 602:92929d26b8db

Fix failure to provide default initialisation vector for AES CBC mode (I'm surprised pycrypto allowed this previously, but it doesn't now, thus catching my error). Also make debug output a bit more helpful

 
 # These imports are optional, we just can't use the authfile (i.e.
 # "remember this password") feature without them
 #
 easyhg_authfile_imports_ok = True
+
 try:
     from Crypto.Cipher import AES
+except ImportError:
+    print "EasyHg: Failed to import Crypto.Cipher module required for authfile support (try installing PyCrypto?)"
+    easyhg_authfile_imports_ok = False
+
+try:
     import ConfigParser # Mercurial version won't write files
     import base64
 except ImportError:
-    print "EasyHg: Failed to import required modules for authfile support"
+    print "EasyHg: Failed to import modules (ConfigParser, base64) required for authfile support"
     easyhg_authfile_imports_ok = False
 
 
 class EasyHgAuthStore(object):
 

         self.auth_config = None
         self.auth_cipher = None
         self.remember = False
 
         if self.use_auth_file:
-            self.auth_cipher = AES.new(self.auth_key, AES.MODE_CBC)
+            self.auth_cipher = AES.new(self.auth_key, AES.MODE_CBC,
+                                       os.urandom(16))
             self.auth_file = os.path.expanduser(self.auth_file)
             self.load_auth_data()
 
     def save(self):
         if self.use_auth_file: