Fix Encryption in Actuator Python Library (#23)

* Fix Encryption in Actuator Python Library
* Update submodules.

common/tmalibrary/setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name='tmalibrary',
-    version='9.12',
+    version='10.0',
     author='Rui Silva',
     author_email='rfsilva@student.dei.uc.pt',
     description='Probe and Actuator Library',

common/tmalibrary/tmalibrary/actuator/HandleRequest.py

@@ -2,8 +2,6 @@
 import base64
 import json
 from .ActuatorPayload import ActuatorPayload
-import os
-from flask import Response
 
 class HandleRequest:
 
@@ -19,8 +17,10 @@ def generateResponse(self, plainResponse):
 		publicKeyExecutorPath = "keys/pub-key-executor"
 		publicKeyExecutor = keymanager.getPublicKey(publicKeyExecutorPath)
 		encryptedMessage = keymanager.encrypt(plainResponse,publicKeyExecutor)
-		response = base64.b64encode(encryptedMessage)
-		return Response("{}\n{}".format(response, signedResponseEncoded), mimetype='application/octet-stream')
+		encryptedMessageBase = base64.b64encode(encryptedMessage)
+		response = str(encryptedMessageBase) + '\n' + str(signedResponseEncoded)
+		responseBytes = response.encode()
+		return responseBytes
 
 	def processRequest(self, request):
 

common/tmalibrary/tmalibrary/actuator/KeyManager.py

@@ -1,30 +1,32 @@
 from Crypto.PublicKey import RSA
-import Crypto.Cipher.PKCS1_v1_5
+from Crypto.Cipher import PKCS1_v1_5
 import Crypto.Signature.PKCS1_v1_5
 from Crypto.Hash import SHA
+from base64 import b64decode
+from base64 import b64encode
 
-import random
 import os
 import errno
 
 class KeyManager:
 
 	def decrypt(self, text, private_key_string):
+
 		# import private key to an RSA object
 		private_key = RSA.importKey(private_key_string)
+		cipher = PKCS1_v1_5.new(private_key)
+
+		message = cipher.decrypt(b64decode(text),"Error while decrypting")
+		return message
 
-		# decrypt the text with the private key
-		cypher = Crypto.Cipher.PKCS1_v1_5.new(private_key)
-		decryptedText = cypher.decrypt(text,15)
-		return decryptedText
 
 	def encrypt(self, text, public_key_string):
+
 		# import public key to an RSA object
 		public_key = RSA.importKey(public_key_string)
-
-		# encrypt the plain text using the public key
-		encryptedText = public_key.encrypt(text.encode('utf-8'), 32)[0]
-		return encryptedText
+		cipher = PKCS1_v1_5.new(public_key)
+		ciphertext = b64encode(cipher.encrypt(bytes(text,"utf-8")))
+		return ciphertext
 
 	def getPrivateKey(self, filenameprivatekey):
                 # read private key from file