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

Import Serialization tests from OpenPGP-Haskell

Browse Source
This commit is contained in:
Stephen Paul Weber
2013-01-20 14:41:37 -05:00
parent ae7454c504
commit 5cba4f2697
93 changed files with 397 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/openpgp.php
View File

@@ -533,6 +533,7 @@ class OpenPGP_SignaturePacket extends OpenPGP_Packet {
$input = substr($input, $length_of_length); // Chop off length header
$tag = ord($input[0]);
$class = self::class_for($tag);
$packet = NULL;
if($class) {
$packet = new $class();
$packet->tag = $tag;
@@ -592,7 +593,7 @@ class OpenPGP_SignaturePacket extends OpenPGP_Packet {
);
static function class_for($tag) {
if(!self::$subpacket_types[$tag]) return NULL;
if(!isset(self::$subpacket_types[$tag])) return NULL;
return 'OpenPGP_SignaturePacket_'.self::$subpacket_types[$tag].'Packet';
}
@@ -827,7 +828,10 @@ class OpenPGP_PublicKeyPacket extends OpenPGP_Packet {
}
$this->timestamp = $timestamp ? $timestamp : time();
$this->version = $version;
$this->key_id = substr($this->fingerprint(), -8);
if(count($this->key) > 0) {
$this->key_id = substr($this->fingerprint(), -8);
}
}
// Find self signatures in a message, these often contain metadata about the key
@@ -1186,9 +1190,9 @@ class OpenPGP_LiteralDataPacket extends OpenPGP_Packet {
function __construct($data=NULL, $opt=array()) {
parent::__construct();
$this->data = $data;
$this->format = $opt['format'] ? $opt['format'] : 'b';
$this->filename = $opt['filename'] ? $opt['filename'] : 'data';
$this->timestamp = $opt['timestamp'] ? $opt['timestamp'] : time();
$this->format = isset($opt['format']) ? $opt['format'] : 'b';
$this->filename = isset($opt['filename']) ? $opt['filename'] : 'data';
$this->timestamp = isset($opt['timestamp']) ? $opt['timestamp'] : time();
}
function normalize() {