Add OpenSSL 1.1 support to CryptMessage plugin by using radfish's pyelliptic version

plugins/CryptMessage/CryptMessage.py

@@ -7,7 +7,7 @@ ecc_cache = {}
 
 
 def eciesEncrypt(data, pubkey, ephemcurve=None, ciphername='aes-256-cbc'):
-    import pyelliptic
+    from lib import pyelliptic
     pubkey_openssl = toOpensslPublickey(base64.b64decode(pubkey))
     curve, pubkey_x, pubkey_y, i = pyelliptic.ECC._decode_pubkey(pubkey_openssl)
     if ephemcurve is None:
@@ -34,7 +34,7 @@ def split(encrypted):
 
 
 def getEcc(privatekey=None):
-    import pyelliptic
+    from lib import pyelliptic
     global ecc_cache
     if privatekey not in ecc_cache:
         if privatekey:

plugins/CryptMessage/CryptMessagePlugin.py

@@ -60,7 +60,7 @@ class UiWebsocketPlugin(object):
     # Encrypt a text using AES
     # Return: Iv, AES key, Encrypted text
     def actionAesEncrypt(self, to, text, key=None, iv=None):
-        import pyelliptic
+        from lib import pyelliptic
 
         if key:
             key = base64.b64decode(key)
@@ -83,7 +83,7 @@ class UiWebsocketPlugin(object):
     # Decrypt a text using AES
     # Return: Decrypted text
     def actionAesDecrypt(self, to, *args):
-        import pyelliptic
+        from lib import pyelliptic
 
         if len(args) == 3:  # Single decrypt
             encrypted_texts = [(args[0], args[1])]