Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5

2015-09-05 18:21:17 +02:00 · 2015-09-05 18:21:17 +02:00 · e98b634c77
commit e98b634c77
parent ef2d286e99 a2898d760e
1 changed files with 0 additions and 8 deletions
--- a/libraries/plugins/auth/AuthenticationCookie.class.php
+++ b/libraries/plugins/auth/AuthenticationCookie.class.php
@ -876,11 +876,3 @@ class AuthenticationCookie extends AuthenticationPlugin
        $this->storePasswordCookie($password);
    }
 }
-
-/**
- * phpseclib
- */
-if (! AuthenticationCookie::useOpenSSL()) {
-    include PHPSECLIB_INC_DIR . '/Crypt/AES.php';
-    include PHPSECLIB_INC_DIR . '/Crypt/Random.php';
-}