diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-03-30 22:36:48 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-07 13:30:28 +0200 |
| commit | dbdd754c3fc37dc3100a9741f956d913e6d64576 (patch) | |
| tree | 9aa55408b331d219a72cd53e2947ef8f06db85ce /apps | |
| parent | 00338f9dca97fd7b48d96201fd607cf460c385ff (diff) | |
| download | nextcloud-server-dbdd754c3fc37dc3100a9741f956d913e6d64576.tar.gz nextcloud-server-dbdd754c3fc37dc3100a9741f956d913e6d64576.zip | |
Further cleanup of files_encryption
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/encryption/lib/crypto/crypt.php | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/apps/encryption/lib/crypto/crypt.php b/apps/encryption/lib/crypto/crypt.php index c9f02bfa1cc..ea7f9e1cdf5 100644 --- a/apps/encryption/lib/crypto/crypt.php +++ b/apps/encryption/lib/crypto/crypt.php @@ -25,9 +25,6 @@ namespace OCA\Encryption\Crypto; use OC\Encryption\Exceptions\DecryptionFailedException; use OC\Encryption\Exceptions\EncryptionFailedException; use OC\Encryption\Exceptions\GenericEncryptionException; -use OCA\Encryption\KeyManager; -use OCA\Files_Encryption\Exception\MultiKeyDecryptException; -use OCA\Files_Encryption\Exception\MultiKeyEncryptException; use OCP\IConfig; use OCP\ILogger; use OCP\IUser; @@ -35,11 +32,6 @@ use OCP\IUserSession; class Crypt { - const ENCRYPTION_UKNOWN_ERROR = -1; - const ENCRYPTION_NOT_INIALIZED_ERROR = 1; - const ENCRYPTIION_PRIVATE_KEY_NOT_VALID_ERROR = 2; - const ENCRYPTION_NO_SHARE_KEY_FOUND = 3; - const BLOCKSIZE = 8192; const DEFAULT_CIPHER = 'AES-256-CFB'; @@ -97,7 +89,7 @@ class Crypt { 'privateKey' => $privateKey ]; } - $log->error('Encryption library couldn\'t export users private key, please check your servers openSSL configuration.' . $user->getUID(), + $log->error('Encryption library couldn\'t export users private key, please check your servers openSSL configuration.' . $this->user->getUID(), ['app' => 'encryption']); if (openssl_error_string()) { $log->error('Encryption Library:' . openssl_error_string(), |