From df22a7c4954acb67c9365f9900bd7a3f70f13487 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Schie=C3=9Fle?= <schiessle@owncloud.com>
Date: Mon, 27 May 2013 12:21:39 +0200
Subject: [PATCH] make legacyDecrypt() private als always call
legacyBlockDecrypt() from other classes
---
apps/files_encryption/hooks/hooks.php | 2 +-
apps/files_encryption/lib/crypt.php | 2 +-
apps/files_encryption/lib/proxy.php | 2 +-
apps/files_encryption/tests/crypt.php | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 07072fb8c4..9af1f2c645 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -76,7 +76,7 @@ class Hooks {
&& $encLegacyKey = $userView->file_get_contents( 'encryption.key' )
) {
- $plainLegacyKey = Crypt::legacyDecrypt( $encLegacyKey, $params['password'] );
+ $plainLegacyKey = Crypt::legacyBlockDecrypt( $encLegacyKey, $params['password'] );
$session->setLegacyKey( $plainLegacyKey );
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 009a648016..9345712a45 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -607,7 +607,7 @@ class Crypt
*
* This function decrypts an content
*/
- public static function legacyDecrypt( $content, $passphrase = '' ) {
+ private static function legacyDecrypt( $content, $passphrase = '' ) {
$bf = self::getBlowfish( $passphrase );
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index eaaeae9b61..d9520810bf 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -223,7 +223,7 @@ class Proxy extends \OC_FileProxy
&& isset( $_SESSION['legacyenckey'] )
&& Crypt::isEncryptedMeta( $path )
) {
- $plainData = Crypt::legacyDecrypt( $data, $session->getLegacyKey() );
+ $plainData = Crypt::legacyBlockDecrypt( $data, $session->getLegacyKey() );
}
\OC_FileProxy::$enabled = $proxyStatus;
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 74b4252a1d..e9f155e264 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -515,7 +515,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
*/
function testLegacyDecryptShort($crypted) {
- $decrypted = Encryption\Crypt::legacyDecrypt($crypted, $this->pass);
+ $decrypted = Encryption\Crypt::legacyBlockDecrypt($crypted, $this->pass);
$this->assertEquals($this->dataShort, $decrypted);
@@ -543,7 +543,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
*/
function testLegacyDecryptLong($crypted) {
- $decrypted = Encryption\Crypt::legacyDecrypt($crypted, $this->pass);
+ $decrypted = Encryption\Crypt::legacyBlockDecrypt($crypted, $this->pass);
$this->assertEquals($this->dataLong, $decrypted);
@@ -560,7 +560,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
$encKey = Encryption\Crypt::legacyCreateKey($this->pass);
// Decrypt key
- $key = Encryption\Crypt::legacyDecrypt($encKey, $this->pass);
+ $key = Encryption\Crypt::legacyBlockDecrypt($encKey, $this->pass);
$this->assertTrue(is_numeric($key));
--
GitLab