Started implementation of new encyryption classes into the encryption proxy

apps/files_encryption/hooks/hooks.php

@@ -30,19 +30,21 @@ class Hooks {
 
 	public static function login( $params ){
 		
-		$view = new \OC_FilesystemView( '/' . $params['uid'] );
+		$view = new \OC_FilesystemView( '/' );
 		
-		$storage = new Storage( $view );
+		$storage = new Storage( $view, $params['uid'] );
 		
 		if ( !$storage->ready() ) {
 		
 			return $storage->setup( $params['password'] );
 			
-		} else {
+		}
+		
+		$_SESSION['enckey'] = OC_Crypt::decrypt($key, $password);
 		
 		return true;
 		
-		}
+		
 	}
 
 }

apps/files_encryption/lib/proxy.php

@@ -27,7 +27,9 @@
  */
 
 class OC_FileProxy_Encryption extends OC_FileProxy {
+
 	private static $blackList = null; //mimetypes blacklisted from encryption
+	
 	private static $enableEncryption = null;
 	
 	/**
@@ -97,7 +99,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 			
 				$size = strlen( $data );
 				
-				$data = Crypt::blockEncrypt( $data );
+				$data = OCA_Encryption\Crypt::symmetricEncryptFileContent( $data, '', $cached['size'] );
 				
 				OC_FileCache::put( $path, array( 'encrypted'=>true, 'size' => $size ), '' );
 				
@@ -106,10 +108,15 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 	}
 	
 	public function postFile_get_contents( $path, $data ) {
+	
 		if ( self::isEncrypted( $path ) ) {
+		
 			$cached = OC_FileCache_Cached::get( $path, '' );
-			$data=OC_Crypt::blockDecrypt($data,'',$cached['size']);
+			
+			$data = OCA_Encryption\Crypt::symmetricDecryptFileContent( $data, '' );
+		
 		}
+		
 		return $data;
 	}