Remove "use" statement

Ref https://bugs.php.net/bug.php?id=66773
remotes/origin/handlebars-approach
Lukas Reschke 11 years ago
parent 4efa7c09b1
commit 90a11efecd
  1. 3
      lib/private/appframework/http/request.php
  2. 7
      lib/private/security/crypto.php

@ -33,7 +33,6 @@ use OC\Security\TrustedDomainHelper;
use OCP\IConfig;
use OCP\IRequest;
use OCP\Security\ISecureRandom;
use OCP\Security\StringUtils;
/**
* Class for accessing variables in the request.
@ -417,7 +416,7 @@ class Request implements \ArrayAccess, \Countable, IRequest {
}
// Check if the token is valid
if(StringUtils::equals($token, $this->items['requesttoken'])) {
if(\OCP\Security\StringUtils::equals($token, $this->items['requesttoken'])) {
return true;
} else {
return false;

@ -27,7 +27,6 @@ use phpseclib\Crypt\AES;
use phpseclib\Crypt\Hash;
use OCP\Security\ICrypto;
use OCP\Security\ISecureRandom;
use OCP\Security\StringUtils;
use OCP\IConfig;
/**
@ -50,6 +49,10 @@ class Crypto implements ICrypto {
/** @var ISecureRandom */
private $random;
/**
* @param IConfig $config
* @param ISecureRandom $random
*/
function __construct(IConfig $config, ISecureRandom $random) {
$this->cipher = new AES();
$this->config = $config;
@ -119,7 +122,7 @@ class Crypto implements ICrypto {
$this->cipher->setIV($iv);
if(!StringUtils::equals($this->calculateHMAC($parts[0].$parts[1], $password), $hmac)) {
if(!\OCP\Security\StringUtils::equals($this->calculateHMAC($parts[0].$parts[1], $password), $hmac)) {
throw new \Exception('HMAC does not match.');
}

Loading…
Cancel
Save