fix for broken tests

This commit is contained in:
Florin Peter 2013-05-15 14:33:08 +02:00
parent 1fbdc3ce8f
commit 63a790b415
1 changed files with 4 additions and 13 deletions

View File

@ -52,16 +52,11 @@ class Hooks {
if(Helper::setupUser($util, $params['password']) === false) {
return false;
}
\OC_FileProxy::$enabled = false;
$encryptedKey = Keymanager::getPrivateKey( $view, $params['uid'] );
\OC_FileProxy::$enabled = true;
//$privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, $params['password'] );
$privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, "helloworld" );
$privateKey = Crypt::symmetricDecryptFileContent( $encryptedKey, $params['password'] );
$session = new Session( $view );
$session->setPrivateKey( $privateKey, $params['uid'] );
@ -86,13 +81,9 @@ class Hooks {
$session->setLegacyKey( $plainLegacyKey );
}
\OC_FileProxy::$enabled = false;
$publicKey = Keymanager::getPublicKey( $view, $params['uid'] );
\OC_FileProxy::$enabled = false;
// Encrypt existing user files:
// This serves to upgrade old versions of the encryption
// app (see appinfo/spec.txt)