Merge branch 'master' into remove_unused_vars

Conflicts:
	apps/files_encryption/hooks/hooks.php
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/proxy.php

diff --cc apps/files_encryption/hooks/hooks.php
index f0d0856d6e1387eb13ea25e4ead2d6e3d1f4118a,9af1f2c6459e99bb4921a19dba78afb587188735..c337106135644157e1abbd30cbb7fe22cfb1020c
--- 1/apps/files_encryption/hooks/hooks.php
--- 2/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@@ -72,18 -72,16 +72,16 @@@ class Hooks 
                        // Set legacy encryption key if it exists, to support \r
                        // depreciated encryption system\r
                        if (\r
 -                              $userView->file_exists( 'encryption.key' )\r
 -                              && $encLegacyKey = $userView->file_get_contents( 'encryption.key' )\r
 +                              $userView->file_exists('encryption.key')\r
 +                              && $encLegacyKey = $userView->file_get_contents('encryption.key')\r
                        ) {\r
- \r
-                               $plainLegacyKey = Crypt::legacyDecrypt($encLegacyKey, $params['password']);\r
- \r
+                       \r
 -                              $plainLegacyKey = Crypt::legacyBlockDecrypt( $encLegacyKey, $params['password'] );\r
++                              $plainLegacyKey = Crypt::legacyBlockDecrypt($encLegacyKey, $params['password']);\r
+                               \r
 -                              $session->setLegacyKey( $plainLegacyKey );\r
 +                              $session->setLegacyKey($plainLegacyKey);\r
- \r
+                       \r
                        }\r
- \r
-                       $publicKey = Keymanager::getPublicKey($view, $params['uid']);\r
- \r
+                       \r
                        // Encrypt existing user files:\r
                        // This serves to upgrade old versions of the encryption\r
                        // app (see appinfo/spec.txt)\r

diff --cc apps/files_encryption/lib/crypt.php
index 11b9298b447fec5e7325192944a56f78878269c7,33f9fc2060d16da56dada22099154b1fe2fdc061..ef50dc0cd7a47934d666db2723e5496cc6601679
--- 1/apps/files_encryption/lib/crypt.php
--- 2/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@@ -610,14 -607,14 +610,13 @@@ class Crypt 
         *\r
         * This function decrypts an content\r
         */\r
-       public static function legacyDecrypt($content, $passphrase = '') {\r
 -      private static function legacyDecrypt( $content, $passphrase = '' ) {\r
++      private static function legacyDecrypt($content, $passphrase = '') {\r
  \r
 -              $bf = self::getBlowfish( $passphrase );\r
 +              $bf = self::getBlowfish($passphrase);\r
  \r
 -              $decrypted = $bf->decrypt( $content );\r
 +              $decrypted = $bf->decrypt($content);\r
  \r
-               return rtrim($decrypted, "\0");;\r
- \r
+               return $decrypted;\r
 -\r
        }\r
  \r
        /**\r
@@@ -626,16 -623,16 +625,17 @@@
         * @param int $maxLength\r
         * @return string\r
         */\r
-       private static function legacyBlockDecrypt($data, $key = '', $maxLength = 0) {\r
 -      public static function legacyBlockDecrypt( $data, $key = '', $maxLength = 0 ) {\r
++      public static function legacyBlockDecrypt($data, $key = '', $maxLength = 0) {\r
++\r
                $result = '';\r
 -              while ( strlen( $data ) ) {\r
 -                      $result .= self::legacyDecrypt( substr( $data, 0, 8192 ), $key );\r
 -                      $data = substr( $data, 8192 );\r
 +              while (strlen($data)) {\r
 +                      $result .= self::legacyDecrypt(substr($data, 0, 8192), $key);\r
 +                      $data = substr($data, 8192);\r
                }\r
 -              if ( $maxLength > 0 ) {\r
 -                      return substr( $result, 0, $maxLength );\r
 +              if ($maxLength > 0) {\r
 +                      return substr($result, 0, $maxLength);\r
                } else {\r
 -                      return rtrim( $result, "\0" );\r
 +                      return rtrim($result, "\0");\r
                }\r
        }\r
  \r

diff --cc apps/files_encryption/lib/proxy.php
index 0efe0a791182ff1a166303ff1b23295ee9e0fb8c,d9520810bf4a891eeb45751379747cebb9cae29d..ae64e852aef5f385ee81fde7bf6bb9f2be6543d1
--- 1/apps/files_encryption/lib/proxy.php
--- 2/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@@ -223,10 -220,10 +223,10 @@@ class Proxy extends \OC_FileProxy 
  
                } elseif (
                        Crypt::mode() == 'server'
 -                      && isset( $_SESSION['legacyenckey'] )
 -                      && Crypt::isEncryptedMeta( $path )
 +                      && isset($_SESSION['legacyenckey'])
 +                      && Crypt::isEncryptedMeta($path)
                ) {
-                       $plainData = Crypt::legacyDecrypt($data, $session->getLegacyKey());
 -                      $plainData = Crypt::legacyBlockDecrypt( $data, $session->getLegacyKey() );
++                      $plainData = Crypt::legacyBlockDecrypt($data, $session->getLegacyKey());
                }
  
                \OC_FileProxy::$enabled = $proxyStatus;

diff --cc apps/files_encryption/tests/crypt.php
Simple merge