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

Support for AES and 3DES are now optional

This commit is contained in:
Stephen Paul Weber 2013-09-14 11:45:49 -05:00
parent 6075d057d0
commit e1181bd25e
1 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/openpgp_crypt_symmetric.php
View File

@ -2,14 +2,14 @@
require_once dirname(__FILE__).'/openpgp.php'; require_once dirname(__FILE__).'/openpgp.php';
@include_once dirname(__FILE__).'/openpgp_crypt_rsa.php'; @include_once dirname(__FILE__).'/openpgp_crypt_rsa.php';
require_once 'Crypt/AES.php'; @include_once 'Crypt/AES.php';
require_once 'Crypt/TripleDES.php'; @include_once 'Crypt/TripleDES.php';
require_once 'Crypt/Random.php'; require_once 'Crypt/Random.php'; // part of phpseclib is absolutely required
class OpenPGP_Crypt_Symmetric { class OpenPGP_Crypt_Symmetric {
public static function encrypt($passphrases_and_keys, $message, $symmetric_algorithm=9) { public static function encrypt($passphrases_and_keys, $message, $symmetric_algorithm=9) {
list($cipher, $key_bytes, $key_block_bytes) = self::getCipher($symmetric_algorithm); list($cipher, $key_bytes, $key_block_bytes) = self::getCipher($symmetric_algorithm);
if(!$cipher) throw new Exception("Only AES/3DES are supported."); if(!$cipher) throw new Exception("Unsupported cipher");
$prefix = crypt_random_string($key_block_bytes); $prefix = crypt_random_string($key_block_bytes);
$prefix .= substr($prefix, -2); $prefix .= substr($prefix, -2);
@ -74,7 +74,7 @@ class OpenPGP_Crypt_Symmetric {
$packet = clone $packet; // Do not mutate orinigal $packet = clone $packet; // Do not mutate orinigal
list($cipher, $key_bytes, $key_block_bytes) = self::getCipher($packet->symmetric_algorithm); list($cipher, $key_bytes, $key_block_bytes) = self::getCipher($packet->symmetric_algorithm);
if(!$cipher) throw new Exception("Only AES/3DES are supported."); if(!$cipher) throw new Exception("Unsupported cipher");
$cipher->setKey($packet->s2k->make_key($pass, $key_bytes)); $cipher->setKey($packet->s2k->make_key($pass, $key_bytes));
$cipher->setIV(substr($packet->encrypted_data, 0, $key_block_bytes)); $cipher->setIV(substr($packet->encrypted_data, 0, $key_block_bytes));
$material = $cipher->decrypt(substr($packet->encrypted_data, $key_block_bytes)); $material = $cipher->decrypt(substr($packet->encrypted_data, $key_block_bytes));
@ -139,26 +139,33 @@ class OpenPGP_Crypt_Symmetric {
} }
public static function getCipher($algo) { public static function getCipher($algo) {
$cipher = NULL;
switch($algo) { switch($algo) {
case 2: case 2:
$cipher = new Crypt_TripleDES(CRYPT_DES_MODE_CFB); if(class_exists('Crypt_TripleDES')) {
$key_bytes = 24; $cipher = new Crypt_TripleDES(CRYPT_DES_MODE_CFB);
$key_block_bytes = 8; $key_bytes = 24;
$key_block_bytes = 8;
}
break; break;
case 7: case 7:
$cipher = new Crypt_AES(CRYPT_AES_MODE_CFB); if(class_exists('Crypt_AES')) {
$cipher->setKeyLength(128); $cipher = new Crypt_AES(CRYPT_AES_MODE_CFB);
$cipher->setKeyLength(128);
}
break; break;
case 8: case 8:
$cipher = new Crypt_AES(CRYPT_AES_MODE_CFB); if(class_exists('Crypt_AES')) {
$cipher->setKeyLength(192); $cipher = new Crypt_AES(CRYPT_AES_MODE_CFB);
$cipher->setKeyLength(192);
}
break; break;
case 9: case 9:
$cipher = new Crypt_AES(CRYPT_AES_MODE_CFB); if(class_exists('Crypt_AES')) {
$cipher->setKeyLength(256); $cipher = new Crypt_AES(CRYPT_AES_MODE_CFB);
$cipher->setKeyLength(256);
}
break; break;
default:
$cipher = NULL;
} }
if(!$cipher) return array(NULL, NULL, NULL); // Unsupported cipher if(!$cipher) return array(NULL, NULL, NULL); // Unsupported cipher
if(!isset($key_bytes)) $key_bytes = $cipher->key_size; if(!isset($key_bytes)) $key_bytes = $cipher->key_size;