Nosial/socialbox-php
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Made message signing in Cryptography use SHA512 as the message content for... #1

Closed
netkas wants to merge 421 commits from master into dev
pull from: master
merge into: Nosial:dev
Conversation 3 Commits 421 Files changed 226 +28 -2
1 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 10e1368942 - Show all commits

30
src/Socialbox/Objects/Database/SigningKeyRecord.php
View file

@ -47,9 +47,24 @@
{
$this->expires = $data['expires']->getTimestamp();
}
elseif(is_string($data['expires']))
{
if(empty($data['expires']))
{
$this->expires = 0;
}
else
{
throw new InvalidArgumentException('Invalid expires value');
$this->expires = strtotime($data['expires']);
}
}
elseif($data['expires'] === null)
{
$this->expires = 0;
}
else
{
throw new InvalidArgumentException('Invalid expires value, got type: ' . gettype($data['expires']));
}
if(is_int($data['created']))
@ -60,9 +75,20 @@
{
$this->created = $data['created']->getTimestamp();
}
elseif(is_string($data['created']))
{
if(empty($data['created']))
{
$this->created = 0;
}
else
{
throw new InvalidArgumentException('Invalid created value');
$this->created = strtotime($data['created']);
}
}
else
{
throw new InvalidArgumentException('Invalid created value type, got ' . gettype($data['created']));
}
}