summaryrefslogtreecommitdiffstats
path: root/lib/private/security
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@owncloud.com>2015-08-03 06:39:53 +0200
committerAndreas Fischer <bantu@owncloud.com>2015-08-03 09:43:45 +0200
commit3b803db6d815a6d015d5fa013c8147d66a559973 (patch)
treea57c944135af4bb3390c1db1806937d320b4b3cd /lib/private/security
parent27bfab37bc2cdc4cc4e3de891c2ecfa7d71b90fd (diff)
downloadnextcloud-server-3b803db6d815a6d015d5fa013c8147d66a559973.tar.gz
nextcloud-server-3b803db6d815a6d015d5fa013c8147d66a559973.zip
Update phpseclib to 2.0
Diffstat (limited to 'lib/private/security')
-rw-r--r--lib/private/security/crypto.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/private/security/crypto.php b/lib/private/security/crypto.php
index bca0f08090d..5a7073e950f 100644
--- a/lib/private/security/crypto.php
+++ b/lib/private/security/crypto.php
@@ -23,8 +23,8 @@
namespace OC\Security;
-use Crypt_AES;
-use Crypt_Hash;
+use phpseclib\Crypt\AES;
+use phpseclib\Crypt\Hash;
use OCP\Security\ICrypto;
use OCP\Security\ISecureRandom;
use OCP\Security\StringUtils;
@@ -41,7 +41,7 @@ use OCP\IConfig;
* @package OC\Security
*/
class Crypto implements ICrypto {
- /** @var Crypt_AES $cipher */
+ /** @var AES $cipher */
private $cipher;
/** @var int */
private $ivLength = 16;
@@ -51,7 +51,7 @@ class Crypto implements ICrypto {
private $random;
function __construct(IConfig $config, ISecureRandom $random) {
- $this->cipher = new Crypt_AES();
+ $this->cipher = new AES();
$this->config = $config;
$this->random = $random;
}
@@ -69,7 +69,7 @@ class Crypto implements ICrypto {
// Append an "a" behind the password and hash it to prevent reusing the same password as for encryption
$password = hash('sha512', $password . 'a');
- $hash = new Crypt_Hash('sha512');
+ $hash = new Hash('sha512');
$hash->setKey($password);
return $hash->hash($message);
}