From 1e4e0cfcd5ddbcb09a17a03d7525d8f3b8ce002f Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 20 Mar 2014 13:21:34 +0100
Subject: [PATCH] Lazy load phpseclib in ext storage config
---
apps/files_external/lib/config.php | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index dbb12ecd9b..f13b25b2e2 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -24,7 +24,6 @@ set_include_path(
get_include_path() . PATH_SEPARATOR .
\OC_App::getAppPath('files_external') . '/3rdparty/phpseclib/phpseclib'
);
-include('Crypt/AES.php');
/**
* Class to configure mount.json globally and for users
@@ -703,6 +702,9 @@ class OC_Mount_Config {
private static function getCipher() {
// note: not caching this to make it thread safe as we'll use
// a different IV for each password
+ if (!class_exists('Crypt_AES', false)) {
+ include('Crypt/AES.php');
+ }
$cipher = new Crypt_AES(CRYPT_AES_MODE_CBC);
$cipher->setKey(\OCP\Config::getSystemValue('passwordsalt'));
return $cipher;
--
GitLab