From bfd47cd2dfad9c613d51fa9b4e5391f25ab57a87 Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Wed, 28 Nov 2012 18:39:19 +0000
Subject: Development snapshot Moved legacy crypto methods from Util into Crypt
 Added preliminary support for reading legacy encrypted files Added some unit
 tests

---
 apps/files_encryption/hooks/hooks.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'apps/files_encryption/hooks')

diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index d2b546e8d1f..2c8921ef351 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -69,6 +69,19 @@ class Hooks {
 			
 // 			trigger_error( "\$_SESSION['enckey'] = {$_SESSION['enckey']}" );
 			
+			$view1 = new \OC_FilesystemView( '/' . $params['uid'] );
+			
+			// Set legacy encryption key if it exists, to support 
+			// depreciated encryption system
+			if ( 
+			$view1->file_exists( 'encryption.key' )
+			&& $legacyKey = $view1->file_get_contents( 'encryption.key' ) 
+			) {
+				
+				$_SESSION['legacyenckey'] = Crypt::legacyDecrypt( $legacyKey, $params['password'] );
+				trigger_error('leg enc key = '.$_SESSION['legacyenckey']);
+			
+			}
 // 		}
 
 		return true;
-- 
cgit v1.2.3