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

Fix sign_key_userid

Browse Source
This commit is contained in:
Stephen Paul Weber 2014-06-28 12:27:25 -05:00
parent 775aa96118
commit 0262b038f1
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/openpgp_crypt_rsa.php
View File

@ -131,7 +131,8 @@ class OpenPGP_Crypt_RSA {
return new OpenPGP_Message(array($sig, $message)); return new OpenPGP_Message(array($sig, $message));
} }
// Pass a message with a key and userid packet to sign /** Pass a message with a key and userid packet to sign */
// TODO: merge this with the normal sign function
function sign_key_userid($packet, $hash='SHA256', $keyid=NULL) { function sign_key_userid($packet, $hash='SHA256', $keyid=NULL) {
if(is_array($packet)) { if(is_array($packet)) {
$packet = new OpenPGP_Message($packet); $packet = new OpenPGP_Message($packet);
@ -145,8 +146,10 @@ class OpenPGP_Crypt_RSA {
if(!$keyid) $keyid = substr($this->key->fingerprint, -16); if(!$keyid) $keyid = substr($this->key->fingerprint, -16);
$key->setHash(strtolower($hash)); $key->setHash(strtolower($hash));
$sig = $packet->signature_and_data(); $sig = NULL;
$sig = $sig[1]; foreach($packet as $p) {
if($p instanceof OpenPGP_SignaturePacket) $sig = $p;
}
if(!$sig) { if(!$sig) {
$sig = new OpenPGP_SignaturePacket($packet, 'RSA', strtoupper($hash)); $sig = new OpenPGP_SignaturePacket($packet, 'RSA', strtoupper($hash));
$sig->signature_type = 0x13; $sig->signature_type = 0x13;
@ -155,7 +158,7 @@ class OpenPGP_Crypt_RSA {
$packet[] = $sig; $packet[] = $sig;
} }
$sig->sign_data(array('RSA' => array($hash => array($key, 'sign')))); $sig->sign_data(array('RSA' => array($hash => function($data) use($key) {return array($key->sign($data));})));
return $packet; return $packet;
} }