Merge branch 'encryption_clean_up' of github.com:owncloud/core into encryption_clean_up

2 files changed, 7 insertions, 7 deletions

diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 95ea3a888be..99c11d0c5fb 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -25,7 +25,6 @@
 

 namespace OCA\Encryption;

 

-//require_once '../3rdparty/Crypt_Blowfish/Blowfish.php';

 require_once realpath(dirname(__FILE__) . '/../3rdparty/Crypt_Blowfish/Blowfish.php');

 

 /**

@@ -514,11 +513,11 @@ class Crypt {
 	}

 

 	/**

-	 * @brief Get the blowfish encryption handeler for a key

+	 * @brief Get the blowfish encryption handler for a key

 	 * @param $key string (optional)

 	 * @return \Crypt_Blowfish blowfish object

 	 *

-	 * if the key is left out, the default handeler will be used

+	 * if the key is left out, the default handler will be used

 	 */

 	private static function getBlowfish($key = '') {

 

@@ -571,4 +570,4 @@ class Crypt {
 		}

 	}

 

-}
\ No newline at end of file
+}

diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index b7b16f25dca..2330a45be84 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -656,9 +656,10 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	
 	
 	/**
-	 * @brief ncryption using legacy blowfish method
-	 * @param data data to encrypt
-	 * @param passwd password
+	 * @brief encryption using legacy blowfish method
+	 * @param $data string data to encrypt
+	 * @param $passwd string password
+	 * @return string
 	 */
 	function legacyEncrypt($data, $passwd) {