From 34dd581fc65584b71365a6c1af01a31c5506e6a9 Mon Sep 17 00:00:00 2001
From: Marco Giovinazzi <marco.giovinazzi@comodojo.org>
Date: Wed, 21 Mar 2018 23:58:21 +0100
Subject: [PATCH 01/10] update reqs in composer.json

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 972028a..98d438c 100644
--- a/composer.json
+++ b/composer.json
@@ -30,8 +30,8 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=5.6.0",
-        "comodojo/xmlrpc": "dev-master",
-        "comodojo/foundation": "dev-master",
+        "comodojo/xmlrpc": "^1.1",
+        "comodojo/foundation": "^1.0",
         "phpseclib/phpseclib": "^2.0"
     },
     "require-dev": {

From ece7be6222b9f2001eac83f9c8726d5153d704d0 Mon Sep 17 00:00:00 2001
From: Marco Giovinazzi <marco.giovinazzi@comodojo.org>
Date: Wed, 4 Jul 2018 00:28:59 +0200
Subject: [PATCH 02/10] ready for 2.0 release

---
 README.md     | 2 --
 composer.json | 1 -
 2 files changed, 3 deletions(-)

diff --git a/README.md b/README.md
index 3c083e7..147be41 100644
--- a/README.md
+++ b/README.md
@@ -4,8 +4,6 @@
 
 Framework-independent XML and JSON(2.0) RPC server
 
-***This is the development branch, please do not use it in production***
-
 ## Installation
 
 Install [composer](https://getcomposer.org/), then:
diff --git a/composer.json b/composer.json
index 98d438c..8472dd6 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,6 @@
             "Comodojo\\RpcServer\\": "src/Comodojo/RpcServer"
         }
     },
-    "minimum-stability": "dev",
     "require": {
         "php": ">=5.6.0",
         "comodojo/xmlrpc": "^1.1",

From 6144dcf7e86fd7e419f9a855cc4e5c4e02d74094 Mon Sep 17 00:00:00 2001
From: pmacelli <91888876+pmacelli@users.noreply.github.com>
Date: Fri, 29 Oct 2021 10:33:47 +0200
Subject: [PATCH 03/10] Update composer.json

---
 composer.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 8472dd6..2fe9c0f 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "comodojo/rpcserver",
+    "name": "pmarcelli/rpcserver",
     "description": "Extensible XML and JSON(2.0) RPC server",
     "license": "MIT",
     "type": "library",
@@ -28,10 +28,10 @@
         }
     },
     "require": {
-        "php": ">=5.6.0",
-        "comodojo/xmlrpc": "^1.1",
-        "comodojo/foundation": "^1.0",
-        "phpseclib/phpseclib": "^2.0"
+        "php": "^7.3",
+        "pmarcelli/xmlrpc": "dev-xmlrpc_u7320",
+        "pmarcelli/foundation": "dev-foundation_u7320",
+        "phpseclib/phpseclib": "^3.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.0|^5.0",

From 807f1c4baa3062169beed14621acef307d10f7a9 Mon Sep 17 00:00:00 2001
From: pmacelli <91888876+pmacelli@users.noreply.github.com>
Date: Wed, 3 Nov 2021 10:02:16 +0100
Subject: [PATCH 04/10] Update RpcServer.php

---
 src/Comodojo/RpcServer/RpcServer.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Comodojo/RpcServer/RpcServer.php b/src/Comodojo/RpcServer/RpcServer.php
index 3faef04..b47de3a 100644
--- a/src/Comodojo/RpcServer/RpcServer.php
+++ b/src/Comodojo/RpcServer/RpcServer.php
@@ -9,7 +9,7 @@
 use \Comodojo\Foundation\Logging\Manager as LogManager;
 use \Comodojo\Xmlrpc\XmlrpcEncoder;
 use \Comodojo\Xmlrpc\XmlrpcDecoder;
-use \phpseclib\Crypt\AES;
+use phpseclib3\Crypt\AES;
 use \Psr\Log\LoggerInterface;
 use \Comodojo\Exception\RpcException;
 use \Comodojo\Exception\XmlrpcException;
@@ -81,7 +81,8 @@ class RpcServer {
 
     /**
      * Encryption key, in case of encrypted transport
-     *
+     * AES key
+     * Only keys of sizes 16, 24 or 32 supported
      * @var string
      */
     private $encrypt;
@@ -395,7 +396,7 @@ private function uncan($payload) {
 
             $this->request_is_encrypted = true;
 
-            $aes = new AES();
+            $aes = new AES('ecb');
 
             $aes->setKey($this->encrypt);
 
@@ -498,7 +499,7 @@ private function can($response, $error) {
 
         if ( $this->request_is_encrypted /* && !empty($encoded) */ ) {
 
-            $aes = new AES();
+            $aes = new AES('ecb');
 
             $aes->setKey($this->encrypt);
 

From ab7741b27807b6e35109abcc9ad04f55bf88bc06 Mon Sep 17 00:00:00 2001
From: pmacelli <91888876+pmacelli@users.noreply.github.com>
Date: Wed, 3 Nov 2021 10:05:04 +0100
Subject: [PATCH 05/10] Update XmlRpcEncryptedTransportTest.php

---
 tests/RpcServer/XmlRpcEncryptedTransportTest.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/RpcServer/XmlRpcEncryptedTransportTest.php b/tests/RpcServer/XmlRpcEncryptedTransportTest.php
index 77c2ea2..1c23912 100644
--- a/tests/RpcServer/XmlRpcEncryptedTransportTest.php
+++ b/tests/RpcServer/XmlRpcEncryptedTransportTest.php
@@ -3,11 +3,12 @@
 use \Comodojo\Xmlrpc\XmlrpcEncoder;
 use \Comodojo\Xmlrpc\XmlrpcDecoder;
 use \Comodojo\RpcServer\RpcServer;
-use \phpseclib\Crypt\AES;
+use phpseclib3\Crypt\AES;
 
 class XmlRpcEncryptedTransportTest extends \PHPUnit_Framework_TestCase {
 
-    protected $key = "solongandthanksforallthefish";
+    //Only keys of sizes 16, 24 or 32 supported
+    protected $key = "solongandthanksforallthefishxxxx";
 
     protected function encodeRequest($method, $parameters) {
 
@@ -15,7 +16,7 @@ protected function encodeRequest($method, $parameters) {
 
         $data = $encoder->encodeCall($method, $parameters);
 
-        $aes = new AES();
+        $aes = new AES('ecb');
 
         $aes->setKey($this->key);
 
@@ -25,7 +26,7 @@ protected function encodeRequest($method, $parameters) {
 
     protected function decodeResponse($received) {
 
-        $aes = new AES();
+        $aes = new AES('ecb');
 
         $aes->setKey($this->key);
 

From 62c9d9ff5e4b47a2968cb8e44a0d445f3139df36 Mon Sep 17 00:00:00 2001
From: pmacelli <91888876+pmacelli@users.noreply.github.com>
Date: Thu, 11 Nov 2021 14:36:54 +0100
Subject: [PATCH 06/10] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 147be41..3c083e7 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,8 @@
 
 Framework-independent XML and JSON(2.0) RPC server
 
+***This is the development branch, please do not use it in production***
+
 ## Installation
 
 Install [composer](https://getcomposer.org/), then:

From 9dc4a5e8f84159274e68cf6ea1adde9c9c07aaa0 Mon Sep 17 00:00:00 2001
From: pmacelli <91888876+pmacelli@users.noreply.github.com>
Date: Thu, 11 Nov 2021 14:37:34 +0100
Subject: [PATCH 07/10] Update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 2fe9c0f..bb4c9e4 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
         }
     },
     "require": {
-        "php": "^7.3",
+        "php": ">=5.6.0",
         "pmarcelli/xmlrpc": "dev-xmlrpc_u7320",
         "pmarcelli/foundation": "dev-foundation_u7320",
         "phpseclib/phpseclib": "^3.0"

From 33a68eedadd37f4df64529a362f99176b9493f7e Mon Sep 17 00:00:00 2001
From: pmacelli <91888876+pmacelli@users.noreply.github.com>
Date: Thu, 11 Nov 2021 15:10:58 +0100
Subject: [PATCH 08/10] Update composer.json

---
 composer.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index bb4c9e4..ff36ca9 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "pmarcelli/rpcserver",
+    "name": "comodojo/rpcserver",
     "description": "Extensible XML and JSON(2.0) RPC server",
     "license": "MIT",
     "type": "library",
@@ -29,8 +29,8 @@
     },
     "require": {
         "php": ">=5.6.0",
-        "pmarcelli/xmlrpc": "dev-xmlrpc_u7320",
-        "pmarcelli/foundation": "dev-foundation_u7320",
+        "comodojo/xmlrpc": "dev-master",
+        "comodojo/foundation": "dev-master",
         "phpseclib/phpseclib": "^3.0"
     },
     "require-dev": {

From 9c202a9b34bfdb08cafb4ccb6c4090d5b6f9507b Mon Sep 17 00:00:00 2001
From: pmacelli <91888876+pmacelli@users.noreply.github.com>
Date: Thu, 11 Nov 2021 16:05:17 +0100
Subject: [PATCH 09/10] Update composer.json

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index ff36ca9..0754caa 100644
--- a/composer.json
+++ b/composer.json
@@ -27,6 +27,7 @@
             "Comodojo\\RpcServer\\": "src/Comodojo/RpcServer"
         }
     },
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.6.0",
         "comodojo/xmlrpc": "dev-master",

From 8cea75949438adae4bc0d80835849e80b9783d8c Mon Sep 17 00:00:00 2001
From: pmacelli <91888876+pmacelli@users.noreply.github.com>
Date: Thu, 18 Nov 2021 16:08:49 +0100
Subject: [PATCH 10/10] Update composer.json

---
 composer.json | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 0754caa..bb4c9e4 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "comodojo/rpcserver",
+    "name": "pmarcelli/rpcserver",
     "description": "Extensible XML and JSON(2.0) RPC server",
     "license": "MIT",
     "type": "library",
@@ -27,11 +27,10 @@
             "Comodojo\\RpcServer\\": "src/Comodojo/RpcServer"
         }
     },
-    "minimum-stability": "dev",
     "require": {
         "php": ">=5.6.0",
-        "comodojo/xmlrpc": "dev-master",
-        "comodojo/foundation": "dev-master",
+        "pmarcelli/xmlrpc": "dev-xmlrpc_u7320",
+        "pmarcelli/foundation": "dev-foundation_u7320",
         "phpseclib/phpseclib": "^3.0"
     },
     "require-dev": {