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

Store the trailer for use in sig verification

Browse Source
This commit is contained in:
Stephen Paul Weber 2010-03-31 09:15:31 -05:00
parent b0f4e73111
commit b7122bbb5f
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/openpgp.php
View File

@ -338,6 +338,7 @@ class OpenPGP_AsymmetricSessionKeyPacket extends OpenPGP_Packet {
*/ */
class OpenPGP_SignaturePacket extends OpenPGP_Packet { class OpenPGP_SignaturePacket extends OpenPGP_Packet {
public $version, $signature_type, $hash_algorithm, $key_algorithm, $hashed_subpackets, $unhashed_subpackets, $hash_head; public $version, $signature_type, $hash_algorithm, $key_algorithm, $hashed_subpackets, $unhashed_subpackets, $hash_head;
public $trailer; // This is the literal bytes that get tacked on the end of the message when verifying the signature
function read() { function read() {
switch($this->version = ord($this->read_byte())) { switch($this->version = ord($this->read_byte())) {
case 3: case 3:
@ -347,10 +348,18 @@ class OpenPGP_SignaturePacket extends OpenPGP_Packet {
$this->signature_type = ord($this->read_byte()); $this->signature_type = ord($this->read_byte());
$this->key_algorithm = ord($this->read_byte()); $this->key_algorithm = ord($this->read_byte());
$this->hash_algorithm = ord($this->read_byte()); $this->hash_algorithm = ord($this->read_byte());
$this->trailer = chr(4).chr($this->signature_type).chr($this->key_algorithm).chr($this->hash_algorithm);
$hashed_size = $this->read_unpacked(2, 'n'); $hashed_size = $this->read_unpacked(2, 'n');
$this->hashed_subpackets = self::get_subpackets($this->read_bytes($hashed_size)); $hashed_subpackets = $this->read_bytes($hashed_size);
$this->trailer .= pack('n', $hashed_size).$hashed_subpackets;
$this->hashed_subpackets = self::get_subpackets($hashed_subpackets);
$this->trailer .= chr(4).chr(0xff).pack('N', 6 + $hashed_size);
$unhashed_size = $this->read_unpacked(2, 'n'); $unhashed_size = $this->read_unpacked(2, 'n');
$this->unhashed_subpackets = self::get_subpackets($this->read_bytes($unhashed_size)); $this->unhashed_subpackets = self::get_subpackets($this->read_bytes($unhashed_size));
$this->hash_head = $this->read_unpacked(2, 'n'); $this->hash_head = $this->read_unpacked(2, 'n');
$this->data = $this->read_mpi(); $this->data = $this->read_mpi();
break; break;