deon/openpgp-php
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update objects to use __toString()

Browse Source
This commit is contained in:
Deon George
2020-06-24 22:37:14 +10:00
parent 358f28273c
commit 9936e839a4
15 changed files with 145 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/OpenPgP/PublicKeyPacket.php
View File

@@ -38,9 +38,15 @@ class PublicKeyPacket extends Packet
function __construct($key=[],$algorithm='RSA',$timestamp=NULL,$version=4)
{
if (self::$DEBUG)
dump(['CREATE'=>__METHOD__,'key'=>$key,'alg'=>$algorithm,'ts'=>$timestamp,'version'=>$version]);
parent::__construct();
if ($key instanceof PublicKeyPacket) {
if (self::$DEBUG)
dump('key is PublicKeyPacket');
$this->algorithm = $key->algorithm;
$this->key = array();
@@ -56,6 +62,9 @@ class PublicKeyPacket extends Packet
$this->v3_days_of_validity = $key->v3_days_of_validity;
} else {
if (self::$DEBUG)
dump(['key'=>$key]);
$this->key = $key;
if (is_string($this->algorithm = $algorithm)) {
$this->algorithm = array_search($this->algorithm,self::$algorithms);