merged skunkworks into develop.
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
<?php namespace Laravel;
|
||||
<?php namespace Laravel; defined('APP_PATH') or die('No direct script access.');
|
||||
|
||||
if (trim(Config::$items['application']['key']) === '')
|
||||
if (trim(Config::get('application.key')) === '')
|
||||
{
|
||||
throw new \LogicException('The encryption class may not be used without an application key.');
|
||||
throw new \Exception('The Crypter class may not be used without an application key.');
|
||||
}
|
||||
|
||||
class Crypter {
|
||||
@@ -12,28 +12,19 @@ class Crypter {
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected static $cipher = MCRYPT_RIJNDAEL_256;
|
||||
public static $cipher = MCRYPT_RIJNDAEL_256;
|
||||
|
||||
/**
|
||||
* The encryption mode.
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected static $mode = MCRYPT_MODE_CBC;
|
||||
public static $mode = MCRYPT_MODE_CBC;
|
||||
|
||||
/**
|
||||
* Encrypt a string using Mcrypt.
|
||||
*
|
||||
* The given string will be encrypted using AES-256 encryption for a high
|
||||
* degree of security. The returned string will also be base64 encoded.
|
||||
*
|
||||
* Mcrypt must be installed on your machine before using this method, and
|
||||
* an application key must be specified in the application configuration.
|
||||
*
|
||||
* <code>
|
||||
* // Encrypt a string using the Mcrypt PHP extension
|
||||
* $encrypted = Crypter::encrpt('secret');
|
||||
* </code>
|
||||
* The string will be encrypted using the AES-256 scheme and will be base64 encoded.
|
||||
*
|
||||
* @param string $value
|
||||
* @return string
|
||||
@@ -50,26 +41,27 @@ class Crypter {
|
||||
/**
|
||||
* Decrypt a string using Mcrypt.
|
||||
*
|
||||
* The given encrypted value must have been encrypted using Laravel and
|
||||
* the application key specified in the application configuration file.
|
||||
*
|
||||
* Mcrypt must be installed on your machine before using this method.
|
||||
*
|
||||
* @param string $value
|
||||
* @return string
|
||||
*/
|
||||
public static function decrypt($value)
|
||||
{
|
||||
if (($value = base64_decode($value)) === false)
|
||||
{
|
||||
throw new \InvalidArgumentException('Input value is not valid base64 data.');
|
||||
}
|
||||
$value = base64_decode($value);
|
||||
|
||||
// To decrypt the value, we first need to extract the input vector and
|
||||
// the encrypted value. The input vector size varies across different
|
||||
// encryption ciphers and modes, so we will get the correct size for
|
||||
// the cipher and mode being used by the class.
|
||||
$iv = substr($value, 0, static::iv_size());
|
||||
|
||||
$value = substr($value, static::iv_size());
|
||||
|
||||
return rtrim(mcrypt_decrypt(static::$cipher, static::key(), $value, static::$mode, $iv), "\0");
|
||||
// Once we have the input vector and the value, we can give them both
|
||||
// to Mcrypt for decryption. The value is sometimes padded with \0,
|
||||
// so we will trim all of the padding characters from the string.
|
||||
$key = static::key();
|
||||
|
||||
return rtrim(mcrypt_decrypt(static::$cipher, $key, $value, static::$mode, $iv), "\0");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -89,7 +81,7 @@ class Crypter {
|
||||
*/
|
||||
protected static function key()
|
||||
{
|
||||
return Config::$items['application']['key'];
|
||||
return Config::get('application.key');
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user