Skip to content

Commit

Permalink
Fix upstream typo
Browse files Browse the repository at this point in the history
  • Loading branch information
slusarz committed Apr 15, 2015
1 parent 1ac82b5 commit 73632e3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions framework/Pgp/bundle/CHANGED
Expand Up @@ -8,6 +8,7 @@ List of changes from upstream sources:
- vendor/singpolyma/openpgp-php/lib/openpgp_crypt_rsa.php

Fixed loading Crypt/RSA.php multiple times.
Fixed typo of 'encrypted_data' property (OpenPGP_Crypt_RSA#decrypt()).

- vendor/singpolyma/openpgp-php/lib/openpgp_crypt_symmetric.php

Expand Down
Expand Up @@ -184,10 +184,10 @@ function decrypt($packet) {
foreach($message as $p) {
if($p instanceof OpenPGP_AsymmetricSessionKeyPacket) {
if($keys instanceof Crypt_RSA) {
$sk = self::try_decrypt_session($keys, substr($p->encyrpted_data, 2));
$sk = self::try_decrypt_session($keys, substr($p->encrypted_data, 2));
} else if(strlen(str_replace('0', '', $p->keyid)) < 1) {
foreach($keys->key as $k) {
$sk = self::try_decrypt_session(self::convert_private_key($k), substr($p->encyrpted_data, 2));
$sk = self::try_decrypt_session(self::convert_private_key($k), substr($p->encrypted_data, 2));
if($sk) break;
}
} else {
Expand Down

0 comments on commit 73632e3

Please sign in to comment.