Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Daemon u7320 #3

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Daemon u7320 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7a2bcde
deps update for 1.0
marcogiovinazzi Nov 7, 2018
f342cdf
update readme
marcogiovinazzi Nov 7, 2018
980352f
deps update for 1.0
marcogiovinazzi Nov 7, 2018
97ec53f
update readme
marcogiovinazzi Nov 7, 2018
c6b3763
Merge branch '1.0' of github.com:comodojo/daemon into 1.0
marcogiovinazzi Nov 19, 2018
1f482e7
Update composer.json
pmacelli Oct 29, 2021
971c2f1
Update SocketTransport.php
pmacelli Nov 3, 2021
c912d4c
Update README.md
pmacelli Nov 11, 2021
e54d6a5
Update composer.json
pmacelli Nov 11, 2021
cdfd45b
Update composer.json
pmacelli Nov 11, 2021
70610cb
Update composer.json
pmacelli Nov 11, 2021
38cdc40
Update composer.json
pmacelli Nov 11, 2021
9759445
Update composer.json
pmacelli Nov 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "comodojo/daemon",
"name": "pmarcelli/daemon",
"description": "Solid PHP daemon toolkit",
"license": "MIT",
"type": "library",
Expand Down Expand Up @@ -29,16 +29,15 @@
"Comodojo\\Daemon\\": "src/Comodojo/Daemon"
}
},
"minimum-stability": "dev",
"require": {
"php": ">=5.6.0",
"ext-posix": "*",
"ext-pcntl": "*",
"ext-shmop": "*",
"ext-sockets": "*",
"comodojo/foundation": "dev-master",
"comodojo/rpcserver": "dev-master",
"comodojo/rpcclient": "dev-master",
"pmarcelli/foundation": "dev-foundation_u7320",
"pmarcelli/rpcserver": "dev-rpcserver_u7320",
"pmarcelli/rpcclient": "dev-rpcclient_u7320",
"league/climate": "^3.0"
},
"require-dev": {
Expand Down
5 changes: 3 additions & 2 deletions src/Comodojo/Daemon/Socket/SocketTransport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

use \Comodojo\RpcClient\Interfaces\Transport as TransportInterface;
use \Comodojo\Httprequest\Httprequest;
use \phpseclib\Crypt\AES;
use phpseclib3\Crypt\AES;
use \Psr\Log\LoggerInterface;
use \Comodojo\Exception\RpcException;
use \Comodojo\Exception\SocketException;
Expand Down Expand Up @@ -203,8 +203,9 @@ private function can($data, $key) {

if ( !empty($key) && is_string($key) ) {

$this->aes = new AES();
$this->aes = new AES('ecb');

//Only keys of sizes 16, 24 or 32 supported
$this->aes->setKey($key);

$return = 'comodojo_encrypted_request-'.base64_encode($this->aes->encrypt($data));
Expand Down