nilsteampassnet / TeamPass

includes/libraries/Authentication/TwoFactorAuth/Providers/Qr/QRicketProvider.php

Indentation +3 added lines, -3 removed lines

@@ -26,11 +26,11 @@
     {
         switch (strtolower($this->format))
         {
-        	case 'p':
+            case 'p':
                 return 'image/png';
-        	case 'g':
+            case 'g':
                 return 'image/gif';
-        	case 'j':
+            case 'j':
                 return 'image/jpeg';
         }
         throw new QRException(sprintf('Unknown MIME-type: %s', $this->format));

includes/libraries/Authentication/Yubico/Yubico.php

Indentation +412 added lines, -412 removed lines

@@ -1,15 +1,15 @@ 
 <?php
-  /**
-   * Class for verifying Yubico One-Time-Passcodes
-   *
-   * @category    Auth
-   * @package     Auth_Yubico
-   * @author      Simon Josefsson <simon@yubico.com>, Olov Danielson <olov@yubico.com>
-   * @copyright   2007-2015 Yubico AB
-   * @license     http://opensource.org/licenses/bsd-license.php New BSD License
-   * @version     2.0
-   * @link        http://www.yubico.com/
-   */
+    /**
+     * Class for verifying Yubico One-Time-Passcodes
+     *
+     * @category    Auth
+     * @package     Auth_Yubico
+     * @author      Simon Josefsson <simon@yubico.com>, Olov Danielson <olov@yubico.com>
+     * @copyright   2007-2015 Yubico AB
+     * @license     http://opensource.org/licenses/bsd-license.php New BSD License
+     * @version     2.0
+     * @link        http://www.yubico.com/
+     */
 
 require_once 'PEAR.php';
 
@@ -34,340 +34,340 @@ 
  */
 class Auth_Yubico
 {
-	/**#@+
+    /**#@+
 	 * @access private
 	 */
 
-	/**
-	 * Yubico client ID
-	 * @var string
-	 */
-	var $_id;
-
-	/**
-	 * Yubico client key
-	 * @var string
-	 */
-	var $_key;
-
-	/**
-	 * URL part of validation server
-	 * @var string
-	 */
-	var $_url;
-
-	/**
-	 * List with URL part of validation servers
-	 * @var array
-	 */
-	var $_url_list;
-
-	/**
-	 * index to _url_list
-	 * @var int
-	 */
-	var $_url_index;
-
-	/**
-	 * Last query to server
-	 * @var string
-	 */
-	var $_lastquery;
-
-	/**
-	 * Response from server
-	 * @var string
-	 */
-	var $_response;
-
-	/**
-	 * Flag whether to use https or not.
-	 * @var boolean
-	 */
-	var $_https;
-
-	/**
-	 * Flag whether to verify HTTPS server certificates or not.
-	 * @var boolean
-	 */
-	var $_httpsverify;
-
-	/**
-	 * Constructor
-	 *
-	 * Sets up the object
-	 * @param    string  $id     The client identity
-	 * @param    string  $key    The client MAC key (optional)
-	 * @param    boolean $https  Flag whether to use https (optional)
-	 * @param    boolean $httpsverify  Flag whether to use verify HTTPS
-	 *                                 server certificates (optional,
-	 *                                 default true)
-	 * @access public
-	 */
-	public function __construct($id, $key = '', $https = 0, $httpsverify = 1)
-	{
-		$this->_id =  $id;
-		$this->_key = base64_decode($key);
-		$this->_https = $https;
-		$this->_httpsverify = $httpsverify;
-	}
-
-	/**
-	 * Specify to use a different URL part for verification.
-	 * The default is "api.yubico.com/wsapi/verify".
-	 *
-	 * @param  string $url  New server URL part to use
-	 * @access public
-	 */
-	function setURLpart($url)
-	{
-		$this->_url = $url;
-	}
-
-	/**
-	 * Get URL part to use for validation.
-	 *
-	 * @return string  Server URL part
-	 * @access public
-	 */
-	function getURLpart()
-	{
-		if ($this->_url) {
-			return $this->_url;
-		} else {
-			return "api.yubico.com/wsapi/verify";
-		}
-	}
-
-
-	/**
-	 * Get next URL part from list to use for validation.
-	 *
-	 * @return mixed string with URL part of false if no more URLs in list
-	 * @access public
-	 */
-	function getNextURLpart()
-	{
-	  if ($this->_url_list) $url_list=$this->_url_list;
-	  else $url_list=array('api.yubico.com/wsapi/2.0/verify',
-			       'api2.yubico.com/wsapi/2.0/verify', 
-			       'api3.yubico.com/wsapi/2.0/verify', 
-			       'api4.yubico.com/wsapi/2.0/verify',
-			       'api5.yubico.com/wsapi/2.0/verify');
+    /**
+     * Yubico client ID
+     * @var string
+     */
+    var $_id;
+
+    /**
+     * Yubico client key
+     * @var string
+     */
+    var $_key;
+
+    /**
+     * URL part of validation server
+     * @var string
+     */
+    var $_url;
+
+    /**
+     * List with URL part of validation servers
+     * @var array
+     */
+    var $_url_list;
+
+    /**
+     * index to _url_list
+     * @var int
+     */
+    var $_url_index;
+
+    /**
+     * Last query to server
+     * @var string
+     */
+    var $_lastquery;
+
+    /**
+     * Response from server
+     * @var string
+     */
+    var $_response;
+
+    /**
+     * Flag whether to use https or not.
+     * @var boolean
+     */
+    var $_https;
+
+    /**
+     * Flag whether to verify HTTPS server certificates or not.
+     * @var boolean
+     */
+    var $_httpsverify;
+
+    /**
+     * Constructor
+     *
+     * Sets up the object
+     * @param    string  $id     The client identity
+     * @param    string  $key    The client MAC key (optional)
+     * @param    boolean $https  Flag whether to use https (optional)
+     * @param    boolean $httpsverify  Flag whether to use verify HTTPS
+     *                                 server certificates (optional,
+     *                                 default true)
+     * @access public
+     */
+    public function __construct($id, $key = '', $https = 0, $httpsverify = 1)
+    {
+        $this->_id =  $id;
+        $this->_key = base64_decode($key);
+        $this->_https = $https;
+        $this->_httpsverify = $httpsverify;
+    }
+
+    /**
+     * Specify to use a different URL part for verification.
+     * The default is "api.yubico.com/wsapi/verify".
+     *
+     * @param  string $url  New server URL part to use
+     * @access public
+     */
+    function setURLpart($url)
+    {
+        $this->_url = $url;
+    }
+
+    /**
+     * Get URL part to use for validation.
+     *
+     * @return string  Server URL part
+     * @access public
+     */
+    function getURLpart()
+    {
+        if ($this->_url) {
+            return $this->_url;
+        } else {
+            return "api.yubico.com/wsapi/verify";
+        }
+    }
+
+
+    /**
+     * Get next URL part from list to use for validation.
+     *
+     * @return mixed string with URL part of false if no more URLs in list
+     * @access public
+     */
+    function getNextURLpart()
+    {
+        if ($this->_url_list) $url_list=$this->_url_list;
+        else $url_list=array('api.yubico.com/wsapi/2.0/verify',
+                    'api2.yubico.com/wsapi/2.0/verify', 
+                    'api3.yubico.com/wsapi/2.0/verify', 
+                    'api4.yubico.com/wsapi/2.0/verify',
+                    'api5.yubico.com/wsapi/2.0/verify');
 	  
-	  if ($this->_url_index>=count($url_list)) return false;
-	  else return $url_list[$this->_url_index++];
-	}
-
-	/**
-	 * Resets index to URL list
-	 *
-	 * @access public
-	 */
-	function URLreset()
-	{
-	  $this->_url_index=0;
-	}
-
-	/**
-	 * Add another URLpart.
-	 *
-	 * @access public
-	 */
-	function addURLpart($URLpart) 
-	{
-	  $this->_url_list[]=$URLpart;
-	}
+        if ($this->_url_index>=count($url_list)) return false;
+        else return $url_list[$this->_url_index++];
+    }
+
+    /**
+     * Resets index to URL list
+     *
+     * @access public
+     */
+    function URLreset()
+    {
+        $this->_url_index=0;
+    }
+
+    /**
+     * Add another URLpart.
+     *
+     * @access public
+     */
+    function addURLpart($URLpart) 
+    {
+        $this->_url_list[]=$URLpart;
+    }
 	
-	/**
-	 * Return the last query sent to the server, if any.
-	 *
-	 * @return string  Request to server
-	 * @access public
-	 */
-	function getLastQuery()
-	{
-		return $this->_lastquery;
-	}
-
-	/**
-	 * Return the last data received from the server, if any.
-	 *
-	 * @return string  Output from server
-	 * @access public
-	 */
-	function getLastResponse()
-	{
-		return $this->_response;
-	}
-
-	/**
-	 * Parse input string into password, yubikey prefix,
-	 * ciphertext, and OTP.
-	 *
-	 * @param  string    Input string to parse
-	 * @param  string    Optional delimiter re-class, default is '[:]'
-	 * @return array     Keyed array with fields
-	 * @access public
-	 */
-	function parsePasswordOTP($str, $delim = '[:]')
-	{
-	  if (!preg_match("/^((.*)" . $delim . ")?" .
-			  "(([cbdefghijklnrtuv]{0,16})" .
-			  "([cbdefghijklnrtuv]{32}))$/i",
-			  $str, $matches)) {
-	    /* Dvorak? */
-	    if (!preg_match("/^((.*)" . $delim . ")?" .
-			    "(([jxe\.uidchtnbpygk]{0,16})" .
-			    "([jxe\.uidchtnbpygk]{32}))$/i",
-			    $str, $matches)) {
-	      return false;
-	    } else {
-	      $ret['otp'] = strtr($matches[3], "jxe.uidchtnbpygk", "cbdefghijklnrtuv");
-	    }
-	  } else {
-	    $ret['otp'] = $matches[3];
-	  }
-	  $ret['password'] = $matches[2];
-	  $ret['prefix'] = $matches[4];
-	  $ret['ciphertext'] = $matches[5];
-	  return $ret;
-	}
-
-	/* TODO? Add functions to get parsed parts of server response? */
-
-	/**
-	 * Parse parameters from last response
-	 *
-	 * example: getParameters("timestamp", "sessioncounter", "sessionuse");
-	 *
-	 * @param  array @parameters  Array with strings representing
-	 *                            parameters to parse
-	 * @return array  parameter array from last response
-	 * @access public
-	 */
-	function getParameters($parameters)
-	{
-	  if ($parameters == null) {
-	    $parameters = array('timestamp', 'sessioncounter', 'sessionuse');
-	  }
-	  $param_array = array();
-	  foreach ($parameters as $param) {
-	    if(!preg_match("/" . $param . "=([0-9]+)/", $this->_response, $out)) {
-	      return PEAR::raiseError('Could not parse parameter ' . $param . ' from response');
-	    }
-	    $param_array[$param]=$out[1];
-	  }
-	  return $param_array;
-	}
-
-	/**
-	 * Verify Yubico OTP against multiple URLs
-	 * Protocol specification 2.0 is used to construct validation requests
-	 *
-	 * @param string $token        Yubico OTP
-	 * @param int $use_timestamp   1=>send request with &timestamp=1 to
-	 *                             get timestamp and session information
-	 *                             in the response
-	 * @param boolean $wait_for_all  If true, wait until all
-	 *                               servers responds (for debugging)
-	 * @param string $sl           Sync level in percentage between 0
-	 *                             and 100 or "fast" or "secure".
-	 * @param int $timeout         Max number of seconds to wait
-	 *                             for responses
-	 * @return mixed               PEAR error on error, true otherwise
-	 * @access public
-	 */
-	function verify($token, $use_timestamp=null, $wait_for_all=False,
-			$sl=null, $timeout=null)
-	{
-	  /* Construct parameters string */
-	  $ret = $this->parsePasswordOTP($token);
-	  if (!$ret) {
-	    return PEAR::raiseError('Could not parse Yubikey OTP');
-	  }
-	  $params = array('id'=>$this->_id, 
-			  'otp'=>$ret['otp'],
-			  'nonce'=>md5(uniqid(rand())));
-	  /* Take care of protocol version 2 parameters */
-	  if ($use_timestamp) $params['timestamp'] = 1;
-	  if ($sl) $params['sl'] = $sl;
-	  if ($timeout) $params['timeout'] = $timeout;
-	  ksort($params);
-	  $parameters = '';
-	  foreach($params as $p=>$v) $parameters .= "&" . $p . "=" . $v;
-	  $parameters = ltrim($parameters, "&");
+    /**
+     * Return the last query sent to the server, if any.
+     *
+     * @return string  Request to server
+     * @access public
+     */
+    function getLastQuery()
+    {
+        return $this->_lastquery;
+    }
+
+    /**
+     * Return the last data received from the server, if any.
+     *
+     * @return string  Output from server
+     * @access public
+     */
+    function getLastResponse()
+    {
+        return $this->_response;
+    }
+
+    /**
+     * Parse input string into password, yubikey prefix,
+     * ciphertext, and OTP.
+     *
+     * @param  string    Input string to parse
+     * @param  string    Optional delimiter re-class, default is '[:]'
+     * @return array     Keyed array with fields
+     * @access public
+     */
+    function parsePasswordOTP($str, $delim = '[:]')
+    {
+        if (!preg_match("/^((.*)" . $delim . ")?" .
+                "(([cbdefghijklnrtuv]{0,16})" .
+                "([cbdefghijklnrtuv]{32}))$/i",
+                $str, $matches)) {
+        /* Dvorak? */
+        if (!preg_match("/^((.*)" . $delim . ")?" .
+                "(([jxe\.uidchtnbpygk]{0,16})" .
+                "([jxe\.uidchtnbpygk]{32}))$/i",
+                $str, $matches)) {
+            return false;
+        } else {
+            $ret['otp'] = strtr($matches[3], "jxe.uidchtnbpygk", "cbdefghijklnrtuv");
+        }
+        } else {
+        $ret['otp'] = $matches[3];
+        }
+        $ret['password'] = $matches[2];
+        $ret['prefix'] = $matches[4];
+        $ret['ciphertext'] = $matches[5];
+        return $ret;
+    }
+
+    /* TODO? Add functions to get parsed parts of server response? */
+
+    /**
+     * Parse parameters from last response
+     *
+     * example: getParameters("timestamp", "sessioncounter", "sessionuse");
+     *
+     * @param  array @parameters  Array with strings representing
+     *                            parameters to parse
+     * @return array  parameter array from last response
+     * @access public
+     */
+    function getParameters($parameters)
+    {
+        if ($parameters == null) {
+        $parameters = array('timestamp', 'sessioncounter', 'sessionuse');
+        }
+        $param_array = array();
+        foreach ($parameters as $param) {
+        if(!preg_match("/" . $param . "=([0-9]+)/", $this->_response, $out)) {
+            return PEAR::raiseError('Could not parse parameter ' . $param . ' from response');
+        }
+        $param_array[$param]=$out[1];
+        }
+        return $param_array;
+    }
+
+    /**
+     * Verify Yubico OTP against multiple URLs
+     * Protocol specification 2.0 is used to construct validation requests
+     *
+     * @param string $token        Yubico OTP
+     * @param int $use_timestamp   1=>send request with &timestamp=1 to
+     *                             get timestamp and session information
+     *                             in the response
+     * @param boolean $wait_for_all  If true, wait until all
+     *                               servers responds (for debugging)
+     * @param string $sl           Sync level in percentage between 0
+     *                             and 100 or "fast" or "secure".
+     * @param int $timeout         Max number of seconds to wait
+     *                             for responses
+     * @return mixed               PEAR error on error, true otherwise
+     * @access public
+     */
+    function verify($token, $use_timestamp=null, $wait_for_all=False,
+            $sl=null, $timeout=null)
+    {
+        /* Construct parameters string */
+        $ret = $this->parsePasswordOTP($token);
+        if (!$ret) {
+        return PEAR::raiseError('Could not parse Yubikey OTP');
+        }
+        $params = array('id'=>$this->_id, 
+                'otp'=>$ret['otp'],
+                'nonce'=>md5(uniqid(rand())));
+        /* Take care of protocol version 2 parameters */
+        if ($use_timestamp) $params['timestamp'] = 1;
+        if ($sl) $params['sl'] = $sl;
+        if ($timeout) $params['timeout'] = $timeout;
+        ksort($params);
+        $parameters = '';
+        foreach($params as $p=>$v) $parameters .= "&" . $p . "=" . $v;
+        $parameters = ltrim($parameters, "&");
 	  
-	  /* Generate signature. */
-	  if($this->_key <> "") {
-	    $signature = base64_encode(hash_hmac('sha1', $parameters,
-						 $this->_key, true));
-	    $signature = preg_replace('/\+/', '%2B', $signature);
-	    $parameters .= '&h=' . $signature;
-	  }
-
-	  /* Generate and prepare request. */
-	  $this->_lastquery=null;
-	  $this->URLreset();
-	  $mh = curl_multi_init();
-	  $ch = array();
-	  while($URLpart=$this->getNextURLpart()) 
-	    {
-	      /* Support https. */
-	      if ($this->_https) {
-		$query = "https://";
-	      } else {
-		$query = "http://";
-	      }
-	      $query .= $URLpart . "?" . $parameters;
-
-	      if ($this->_lastquery) { $this->_lastquery .= " "; }
-	      $this->_lastquery .= $query;
+        /* Generate signature. */
+        if($this->_key <> "") {
+        $signature = base64_encode(hash_hmac('sha1', $parameters,
+                            $this->_key, true));
+        $signature = preg_replace('/\+/', '%2B', $signature);
+        $parameters .= '&h=' . $signature;
+        }
+
+        /* Generate and prepare request. */
+        $this->_lastquery=null;
+        $this->URLreset();
+        $mh = curl_multi_init();
+        $ch = array();
+        while($URLpart=$this->getNextURLpart()) 
+        {
+            /* Support https. */
+            if ($this->_https) {
+        $query = "https://";
+            } else {
+        $query = "http://";
+            }
+            $query .= $URLpart . "?" . $parameters;
+
+            if ($this->_lastquery) { $this->_lastquery .= " "; }
+            $this->_lastquery .= $query;
 	      
-	      $handle = curl_init($query);
-	      curl_setopt($handle, CURLOPT_USERAGENT, "PEAR Auth_Yubico");
-	      curl_setopt($handle, CURLOPT_RETURNTRANSFER, 1);
-	      if (!$this->_httpsverify) {
-		curl_setopt($handle, CURLOPT_SSL_VERIFYPEER, 0);
-		curl_setopt($handle, CURLOPT_SSL_VERIFYHOST, 0);
-	      }
-	      curl_setopt($handle, CURLOPT_FAILONERROR, true);
-	      /* If timeout is set, we better apply it here as well
+            $handle = curl_init($query);
+            curl_setopt($handle, CURLOPT_USERAGENT, "PEAR Auth_Yubico");
+            curl_setopt($handle, CURLOPT_RETURNTRANSFER, 1);
+            if (!$this->_httpsverify) {
+        curl_setopt($handle, CURLOPT_SSL_VERIFYPEER, 0);
+        curl_setopt($handle, CURLOPT_SSL_VERIFYHOST, 0);
+            }
+            curl_setopt($handle, CURLOPT_FAILONERROR, true);
+            /* If timeout is set, we better apply it here as well
 	         in case the validation server fails to follow it. 
 	      */ 
-	      if ($timeout) curl_setopt($handle, CURLOPT_TIMEOUT, $timeout);
-	      curl_multi_add_handle($mh, $handle);
+            if ($timeout) curl_setopt($handle, CURLOPT_TIMEOUT, $timeout);
+            curl_multi_add_handle($mh, $handle);
 	      
-	      $ch[(int)$handle] = $handle;
-	    }
-
-	  /* Execute and read request. */
-	  $this->_response=null;
-	  $replay=False;
-	  $valid=False;
-	  do {
-	    /* Let curl do its work. */
-	    while (($mrc = curl_multi_exec($mh, $active))
-		   == CURLM_CALL_MULTI_PERFORM)
-	      ;
-
-	    while ($info = curl_multi_info_read($mh)) {
-	      if ($info['result'] == CURLE_OK) {
-
-		/* We have a complete response from one server. */
-
-		$str = curl_multi_getcontent($info['handle']);
-		$cinfo = curl_getinfo ($info['handle']);
+            $ch[(int)$handle] = $handle;
+        }
+
+        /* Execute and read request. */
+        $this->_response=null;
+        $replay=False;
+        $valid=False;
+        do {
+        /* Let curl do its work. */
+        while (($mrc = curl_multi_exec($mh, $active))
+            == CURLM_CALL_MULTI_PERFORM)
+            ;
+
+        while ($info = curl_multi_info_read($mh)) {
+            if ($info['result'] == CURLE_OK) {
+
+        /* We have a complete response from one server. */
+
+        $str = curl_multi_getcontent($info['handle']);
+        $cinfo = curl_getinfo ($info['handle']);
 		
-		if ($wait_for_all) { # Better debug info
-		  $this->_response .= 'URL=' . $cinfo['url'] ."\n"
-		    . $str . "\n";
-		}
+        if ($wait_for_all) { # Better debug info
+            $this->_response .= 'URL=' . $cinfo['url'] ."\n"
+            . $str . "\n";
+        }
 
-		if (preg_match("/status=([a-zA-Z0-9_]+)/", $str, $out)) {
-		  $status = $out[1];
+        if (preg_match("/status=([a-zA-Z0-9_]+)/", $str, $out)) {
+            $status = $out[1];
 
-		  /* 
+            /* 
 		   * There are 3 cases.
 		   *
 		   * 1. OTP or Nonce values doesn't match - ignore
@@ -379,92 +379,92 @@ 
 		   *
 		   * 3. Return if status=OK or status=REPLAYED_OTP.
 		   */
-		  if (!preg_match("/otp=".$params['otp']."/", $str) ||
-		      !preg_match("/nonce=".$params['nonce']."/", $str)) {
-		    /* Case 1. Ignore response. */
-		  } 
-		  elseif ($this->_key <> "") {
-		    /* Case 2. Verify signature first */
-		    $rows = explode("\r\n", trim($str));
-		    $response=array();
-		    while (list($key, $val) = each($rows)) {
-		      /* = is also used in BASE64 encoding so we only replace the first = by # which is not used in BASE64 */
-		      $val = preg_replace('/=/', '#', $val, 1);
-		      $row = explode("#", $val);
-		      $response[$row[0]] = $row[1];
-		    }
+            if (!preg_match("/otp=".$params['otp']."/", $str) ||
+              !preg_match("/nonce=".$params['nonce']."/", $str)) {
+            /* Case 1. Ignore response. */
+            } 
+            elseif ($this->_key <> "") {
+            /* Case 2. Verify signature first */
+            $rows = explode("\r\n", trim($str));
+            $response=array();
+            while (list($key, $val) = each($rows)) {
+                /* = is also used in BASE64 encoding so we only replace the first = by # which is not used in BASE64 */
+                $val = preg_replace('/=/', '#', $val, 1);
+                $row = explode("#", $val);
+                $response[$row[0]] = $row[1];
+            }
 		    
-		    $parameters=array('nonce','otp', 'sessioncounter', 'sessionuse', 'sl', 'status', 't', 'timeout', 'timestamp');
-		    sort($parameters);
-		    $check=Null;
-		    foreach ($parameters as $param) {
-		      if (array_key_exists($param, $response)) {
-			if ($check) $check = $check . '&';
-			$check = $check . $param . '=' . $response[$param];
-		      }
-		    }
-
-		    $checksignature =
-		      base64_encode(hash_hmac('sha1', utf8_encode($check),
-					      $this->_key, true));
-
-		    if($response['h'] == $checksignature) {
-		      if ($status == 'REPLAYED_OTP') {
-			if (!$wait_for_all) { $this->_response = $str; }
-			$replay=True;
-		      } 
-		      if ($status == 'OK') {
-			if (!$wait_for_all) { $this->_response = $str; }
-			$valid=True;
-		      }
-		    }
-		  } else {
-		    /* Case 3. We check the status directly */
-		    if ($status == 'REPLAYED_OTP') {
-		      if (!$wait_for_all) { $this->_response = $str; }
-		      $replay=True;
-		    } 
-		    if ($status == 'OK') {
-		      if (!$wait_for_all) { $this->_response = $str; }
-		      $valid=True;
-		    }
-		  }
-		}
-		if (!$wait_for_all && ($valid || $replay)) 
-		  {
-		    /* We have status=OK or status=REPLAYED_OTP, return. */
-		    foreach ($ch as $h) {
-		      curl_multi_remove_handle($mh, $h);
-		      curl_close($h);
-		    }
-		    curl_multi_close($mh);
-		    if ($replay) return PEAR::raiseError('REPLAYED_OTP');
-		    if ($valid) return true;
-		    return PEAR::raiseError($status);
-		  }
+            $parameters=array('nonce','otp', 'sessioncounter', 'sessionuse', 'sl', 'status', 't', 'timeout', 'timestamp');
+            sort($parameters);
+            $check=Null;
+            foreach ($parameters as $param) {
+                if (array_key_exists($param, $response)) {
+            if ($check) $check = $check . '&';
+            $check = $check . $param . '=' . $response[$param];
+                }
+            }
+
+            $checksignature =
+                base64_encode(hash_hmac('sha1', utf8_encode($check),
+                            $this->_key, true));
+
+            if($response['h'] == $checksignature) {
+                if ($status == 'REPLAYED_OTP') {
+            if (!$wait_for_all) { $this->_response = $str; }
+            $replay=True;
+                } 
+                if ($status == 'OK') {
+            if (!$wait_for_all) { $this->_response = $str; }
+            $valid=True;
+                }
+            }
+            } else {
+            /* Case 3. We check the status directly */
+            if ($status == 'REPLAYED_OTP') {
+                if (!$wait_for_all) { $this->_response = $str; }
+                $replay=True;
+            } 
+            if ($status == 'OK') {
+                if (!$wait_for_all) { $this->_response = $str; }
+                $valid=True;
+            }
+            }
+        }
+        if (!$wait_for_all && ($valid || $replay)) 
+            {
+            /* We have status=OK or status=REPLAYED_OTP, return. */
+            foreach ($ch as $h) {
+                curl_multi_remove_handle($mh, $h);
+                curl_close($h);
+            }
+            curl_multi_close($mh);
+            if ($replay) return PEAR::raiseError('REPLAYED_OTP');
+            if ($valid) return true;
+            return PEAR::raiseError($status);
+            }
 		
-		curl_multi_remove_handle($mh, $info['handle']);
-		curl_close($info['handle']);
-		unset ($ch[(int)$info['handle']]);
-	      }
-	      curl_multi_select($mh);
-	    }
-	  } while ($active);
-
-	  /* Typically this is only reached for wait_for_all=true or
+        curl_multi_remove_handle($mh, $info['handle']);
+        curl_close($info['handle']);
+        unset ($ch[(int)$info['handle']]);
+            }
+            curl_multi_select($mh);
+        }
+        } while ($active);
+
+        /* Typically this is only reached for wait_for_all=true or
 	   * when the timeout is reached and there is no
 	   * OK/REPLAYED_REQUEST answer (think firewall).
 	   */
 
-	  foreach ($ch as $h) {
-	    curl_multi_remove_handle ($mh, $h);
-	    curl_close ($h);
-	  }
-	  curl_multi_close ($mh);
+        foreach ($ch as $h) {
+        curl_multi_remove_handle ($mh, $h);
+        curl_close ($h);
+        }
+        curl_multi_close ($mh);
 	  
-	  if ($replay) return PEAR::raiseError('REPLAYED_OTP');
-	  if ($valid) return true;
-	  return PEAR::raiseError('NO_VALID_ANSWER');
-	}
+        if ($replay) return PEAR::raiseError('REPLAYED_OTP');
+        if ($valid) return true;
+        return PEAR::raiseError('NO_VALID_ANSWER');
+    }
 }
 ?>

includes/libraries/Authentication/agses/axs/AXSErrorcodes.inc.php

Indentation +380 added lines, -380 removed lines

@@ -2,448 +2,448 @@
 
 class AXSErrorcodes {
 	
-	// Global Integer Return Values used in all methods that return Integers
-	// and are called from the outside world (webservices, etc.)
-	// List of returnvalue ranges:
-	// x	> 0			: Positive Result (true with more infos (depending on application)
-	// x	== 0		: Default FALSE
-	// x	< 0			: Negative Result (normally false, but with more infos)
-	// x	== -100		: No Active Message found
-	// x	== -1000	: Internal Server Error, see server log for details (should not happen)
-	// x	< -1000		: ERROR values
-	
-	/**
-	 * Extract the error code contained in an ERROR string and return the code
-	 * @param message ERROR String received from AXS web service
-	 * @return error code found in ERROR message or -10000 if no error code could be found
-	 */
-	function getErrorcode($message) {
-		$errorcode = -10000;
-		if (($begin = strpos($message, "ERROR (")) === FALSE)
-			$begin = -1;
-		if (($end = strpos($message, ")")) === FALSE)
-			$end = -1;
+    // Global Integer Return Values used in all methods that return Integers
+    // and are called from the outside world (webservices, etc.)
+    // List of returnvalue ranges:
+    // x	> 0			: Positive Result (true with more infos (depending on application)
+    // x	== 0		: Default FALSE
+    // x	< 0			: Negative Result (normally false, but with more infos)
+    // x	== -100		: No Active Message found
+    // x	== -1000	: Internal Server Error, see server log for details (should not happen)
+    // x	< -1000		: ERROR values
+	
+    /**
+     * Extract the error code contained in an ERROR string and return the code
+     * @param message ERROR String received from AXS web service
+     * @return error code found in ERROR message or -10000 if no error code could be found
+     */
+    function getErrorcode($message) {
+        $errorcode = -10000;
+        if (($begin = strpos($message, "ERROR (")) === FALSE)
+            $begin = -1;
+        if (($end = strpos($message, ")")) === FALSE)
+            $end = -1;
 		
-		if ($begin >= 0 && $end >= 0) {
-			$realBegin = $begin + 7;
-			$errorcode = substr($message, $realBegin, $end - $realBegin);
-		}
-		return $errorcode;
-	}
+        if ($begin >= 0 && $end >= 0) {
+            $realBegin = $begin + 7;
+            $errorcode = substr($message, $realBegin, $end - $realBegin);
+        }
+        return $errorcode;
+    }
 
-	/*
+    /*
 	 * Reserved errors
 	 */
-	const RETURN_VALUE_DEFAULT_FALSE = 0;
+    const RETURN_VALUE_DEFAULT_FALSE = 0;
 
-	const ERROR_HEDGEID_WRONG = -1;
-	const ERROR_RESPONSE_NOT_VALID_ANYMORE = -2;
-	const ERROR_RESPONSE_VERFICATION_FAILED_MORE_TRY_LEFT = -3;
-	const ERROR_RESPONSE_MAX_TRIES_REACHED = -4;
-	
-	const ERROR_RESPONSE_WITHOUT_MESSAGE = -100;
-	const ERROR_RESPONSE_NULL = -101;
-	const ERROR_HEDGEID_NULL = -102;
-	const ERROR_RESPONSE_EMPTY = -103;
-	const ERROR_HEDGEID_EMPTY = -104;
-	
-	/*
+    const ERROR_HEDGEID_WRONG = -1;
+    const ERROR_RESPONSE_NOT_VALID_ANYMORE = -2;
+    const ERROR_RESPONSE_VERFICATION_FAILED_MORE_TRY_LEFT = -3;
+    const ERROR_RESPONSE_MAX_TRIES_REACHED = -4;
+	
+    const ERROR_RESPONSE_WITHOUT_MESSAGE = -100;
+    const ERROR_RESPONSE_NULL = -101;
+    const ERROR_HEDGEID_NULL = -102;
+    const ERROR_RESPONSE_EMPTY = -103;
+    const ERROR_HEDGEID_EMPTY = -104;
+	
+    /*
 	 * Token errors (-1001 to -1099)
 	 */
-	const ERROR_TOKEN_NOT_FOUND = -1001;
-	const ERROR_TOKEN_LOCKED = -1002;
-	const ERROR_TOKEN_DOES_NOT_SUPPORT_APPLICATION = -1003;
-	const ERROR_TOKEN_EXPORT = -1004;
-	const ERROR_TOKEN_REMOVE = -1005;
-	const ERROR_TOKEN_READY_FOR_PRODUCTIONLOT_NOT_FOUND = -1006;
-	const ERROR_TOKEN_NOT_IN_PRODUCTION_STATE = -1007;
-	const ERROR_TOKEN_TYPE_NOT_FOUND = -1008;
-	const ERROR_TOKEN_WRONG_STATE = -1009;
-	const ERROR_TOKEN_BRLC_NOT_FOUND = -1010;
-	const ERROR_TOKEN_ASSIGN_SAME_SERIAL_NUMBER_TO_OTHER_TOKEN = -1011;
-	const ERROR_TOKEN_SERIAL_NUMBER_ALREADY_ASSIGNED = -1012;
-	const ERROR_TOKEN_UNLOCK_COUNTER_MAXIMUM_REACHED = -1013;
-	const ERROR_TOKEN_REVOKED = -1014;
-	const ERROR_TOKEN_DOES_NOT_SUPPORT_BRANDING = -1015;
-	const ERROR_TOKEN_TO_DELETE_IN_WRONG_STATE = -1016;
-	
-	const ERROR_DR_TOKENENTITY_NOT_FOUND = -1025;
-	
-	// ERROR if the token could not be found on the local server
-	// (automatic key fetching not enabled)
-	const ERROR_TOKEN_NOT_FOUND_NO_KEYFETCHING = -1051;
-	const ERROR_TOKEN_NOT_FOUND_KEYFETCHING_TEMPORARY_NOT_AVAILABLE = -1052;
-	
-	/*
+    const ERROR_TOKEN_NOT_FOUND = -1001;
+    const ERROR_TOKEN_LOCKED = -1002;
+    const ERROR_TOKEN_DOES_NOT_SUPPORT_APPLICATION = -1003;
+    const ERROR_TOKEN_EXPORT = -1004;
+    const ERROR_TOKEN_REMOVE = -1005;
+    const ERROR_TOKEN_READY_FOR_PRODUCTIONLOT_NOT_FOUND = -1006;
+    const ERROR_TOKEN_NOT_IN_PRODUCTION_STATE = -1007;
+    const ERROR_TOKEN_TYPE_NOT_FOUND = -1008;
+    const ERROR_TOKEN_WRONG_STATE = -1009;
+    const ERROR_TOKEN_BRLC_NOT_FOUND = -1010;
+    const ERROR_TOKEN_ASSIGN_SAME_SERIAL_NUMBER_TO_OTHER_TOKEN = -1011;
+    const ERROR_TOKEN_SERIAL_NUMBER_ALREADY_ASSIGNED = -1012;
+    const ERROR_TOKEN_UNLOCK_COUNTER_MAXIMUM_REACHED = -1013;
+    const ERROR_TOKEN_REVOKED = -1014;
+    const ERROR_TOKEN_DOES_NOT_SUPPORT_BRANDING = -1015;
+    const ERROR_TOKEN_TO_DELETE_IN_WRONG_STATE = -1016;
+	
+    const ERROR_DR_TOKENENTITY_NOT_FOUND = -1025;
+	
+    // ERROR if the token could not be found on the local server
+    // (automatic key fetching not enabled)
+    const ERROR_TOKEN_NOT_FOUND_NO_KEYFETCHING = -1051;
+    const ERROR_TOKEN_NOT_FOUND_KEYFETCHING_TEMPORARY_NOT_AVAILABLE = -1052;
+	
+    /*
 	 * Key errors (-1100 to -1199)
 	 */
-	const ERROR_KEY_NOT_FOUND = -1100;
-	const ERROR_NO_UNASSIGNED_KEY_FOUND = -1101;
-	const ERROR_ISSUER_KEY_NOT_FOUND = -1102;
-	const ERROR_KEY_NOT_UPDATED = -1103;
-	/* removed 2008-11-13 - smm	
+    const ERROR_KEY_NOT_FOUND = -1100;
+    const ERROR_NO_UNASSIGNED_KEY_FOUND = -1101;
+    const ERROR_ISSUER_KEY_NOT_FOUND = -1102;
+    const ERROR_KEY_NOT_UPDATED = -1103;
+    /* removed 2008-11-13 - smm	
 	 * The error does not occur anymore
 	 * const ERROR_KEY_FOR_KEYLOADING_NOT_CREATED = -1104;
 	 */
-	const ERROR_REEXPORT_KEYS_ON_NORMAL_AXS_AS = -1105;
-	const ERROR_NUMBER_OF_KEYS_OUT_OF_BOUNDS = -1106;
-	const ERROR_COULD_NOT_FIND_NUMBER_OF_KEYS = -1107;
-	const ERROR_CANNOT_ASSIGN_AXS_EXCLUSIVE_KEY_TO_AA = -1108;
-	const ERROR_TEMPORARY_KEY_NOT_CALCULATED = -1109;
-	const ERROR_SM_NOT_AUTHORIZED_TO_RECEIVE_FMS_KEY = -1110;
-	const ERROR_NOT_AUTHORIZED_TO_DELETE_KEY = -1111;
-	const ERROR_CANNOT_FORCE_KEY_DELETION = -1112;
-	// the key is locked, introduced in V2.20.00
-	const ERROR_KEY_LOCKED = -1113;
-	// non-expiring key errors, introduced in V2.20.00
-	const ERROR_NON_EXPIRING_KEY_NOT_FOUND = -1114;
-	const ERROR_NON_EXPIRING_KEY_NOT_READY_TWO_ADDITIONAL_AUTHENTICATIONS_NEEDED = -1115;
-	const ERROR_NON_EXPIRING_KEY_NOT_READY_ONE_ADDITIONAL_AUTHENTICATION_NEEDED = -1116;
-	
-	// ERROR if no free key is available on the local server and
-	// the automatic key fetching is not enabled
-	const ERROR_NO_UNASSIGNED_KEY_FOUND_NO_KEYFETCHING = -1151;
-	const ERROR_KEY_NOT_FOUND_KEYFETCHING_TEMPORARY_NOT_AVAILABLE = -1152;
-	
-	
-	/*
+    const ERROR_REEXPORT_KEYS_ON_NORMAL_AXS_AS = -1105;
+    const ERROR_NUMBER_OF_KEYS_OUT_OF_BOUNDS = -1106;
+    const ERROR_COULD_NOT_FIND_NUMBER_OF_KEYS = -1107;
+    const ERROR_CANNOT_ASSIGN_AXS_EXCLUSIVE_KEY_TO_AA = -1108;
+    const ERROR_TEMPORARY_KEY_NOT_CALCULATED = -1109;
+    const ERROR_SM_NOT_AUTHORIZED_TO_RECEIVE_FMS_KEY = -1110;
+    const ERROR_NOT_AUTHORIZED_TO_DELETE_KEY = -1111;
+    const ERROR_CANNOT_FORCE_KEY_DELETION = -1112;
+    // the key is locked, introduced in V2.20.00
+    const ERROR_KEY_LOCKED = -1113;
+    // non-expiring key errors, introduced in V2.20.00
+    const ERROR_NON_EXPIRING_KEY_NOT_FOUND = -1114;
+    const ERROR_NON_EXPIRING_KEY_NOT_READY_TWO_ADDITIONAL_AUTHENTICATIONS_NEEDED = -1115;
+    const ERROR_NON_EXPIRING_KEY_NOT_READY_ONE_ADDITIONAL_AUTHENTICATION_NEEDED = -1116;
+	
+    // ERROR if no free key is available on the local server and
+    // the automatic key fetching is not enabled
+    const ERROR_NO_UNASSIGNED_KEY_FOUND_NO_KEYFETCHING = -1151;
+    const ERROR_KEY_NOT_FOUND_KEYFETCHING_TEMPORARY_NOT_AVAILABLE = -1152;
+	
+	
+    /*
 	 * Firmware errors (-1200 to -1299)
 	 */
-	const ERROR_FW_NOT_FOUND = -1200;
-	const ERROR_FW_SUCCESSOR_NOT_FOUND = -1201;
-	const ERROR_FW_INITIAL_KEY_NOT_FOUND = -1202;
-	const ERROR_FW_INITIAL_KEY_NOT_HEX = -1203;
-	const ERROR_FW_INITIAL_KEY_INCORRECT_LENGTH = -1204;
-	const ERROR_FW_ACTUAL_VERSION_NULL = -1205;
-	const ERROR_FW_ACTUAL_VERSION_EMPTY = -1206;
-	const ERROR_FW_VERSION_NOT_VALID = -1207;
-	const ERROR_FW_ENCRYPTED_FIRMWARE_URL_NOT_SET = -1208;
-	const ERROR_FW_ANCESTOR_ALREADY_HAS_SUCCESSOR = -1209;
-	const ERROR_FW_UPDATE_SEED_NOT_SET = -1210;
+    const ERROR_FW_NOT_FOUND = -1200;
+    const ERROR_FW_SUCCESSOR_NOT_FOUND = -1201;
+    const ERROR_FW_INITIAL_KEY_NOT_FOUND = -1202;
+    const ERROR_FW_INITIAL_KEY_NOT_HEX = -1203;
+    const ERROR_FW_INITIAL_KEY_INCORRECT_LENGTH = -1204;
+    const ERROR_FW_ACTUAL_VERSION_NULL = -1205;
+    const ERROR_FW_ACTUAL_VERSION_EMPTY = -1206;
+    const ERROR_FW_VERSION_NOT_VALID = -1207;
+    const ERROR_FW_ENCRYPTED_FIRMWARE_URL_NOT_SET = -1208;
+    const ERROR_FW_ANCESTOR_ALREADY_HAS_SUCCESSOR = -1209;
+    const ERROR_FW_UPDATE_SEED_NOT_SET = -1210;
 
-	/*
+    /*
 	 * AA errors (-1300 to -1399)
 	 */
-	const ERROR_AA_NOT_FOUND = -1300;
-	const ERROR_AA_NOT_TOKEN_ISSUER = -1301;
-	const ERROR_AA_DOES_NOT_OWN_BRANDING = -1302;
-	const ERROR_AA_NO_ENROLMENT_RIGHT = -1303;
-	const ERROR_AA_DOES_NOT_MEET_MIN_ENROLMENT_TYPE = -1304;
-	const ERROR_AA_SIGNATURE_NOT_VERIFIED = -1305;
-	const ERROR_AA_SIGNATURE_NULL_OR_EMPTY = -1306;
-	const ERROR_AA_SIGNATURE_DATA_NOT_SET_OR_EMPTY = -1307;
-	const ERROR_AA_BRANDINGID_NULL = -1308;
-	const ERROR_AA_BRANDINGID_EMPTY = -1309;
-	const ERROR_AA_BRANDINGID_TOO_SHORT = -1310;
-	const ERROR_AA_BRANDINGID_TOO_LONG = -1311;
-	const ERROR_AA_BRANDINGID_NOT_NUMBER = -1312;
-	const ERROR_AA_NAME_NULL = -1313;
-	const ERROR_AA_NAME_EMPTY = -1314;
-	const ERROR_AA_NAME_TOO_SHORT = -1315;
-	const ERROR_AA_NAME_TOO_LONG = -1316;
-	const ERROR_AA_BRANDINGID_NOT_HEX = -1317;
-	const ERROR_IL_NOT_AUTHORIZED_TO_IMPORT_BLC = -1318;
+    const ERROR_AA_NOT_FOUND = -1300;
+    const ERROR_AA_NOT_TOKEN_ISSUER = -1301;
+    const ERROR_AA_DOES_NOT_OWN_BRANDING = -1302;
+    const ERROR_AA_NO_ENROLMENT_RIGHT = -1303;
+    const ERROR_AA_DOES_NOT_MEET_MIN_ENROLMENT_TYPE = -1304;
+    const ERROR_AA_SIGNATURE_NOT_VERIFIED = -1305;
+    const ERROR_AA_SIGNATURE_NULL_OR_EMPTY = -1306;
+    const ERROR_AA_SIGNATURE_DATA_NOT_SET_OR_EMPTY = -1307;
+    const ERROR_AA_BRANDINGID_NULL = -1308;
+    const ERROR_AA_BRANDINGID_EMPTY = -1309;
+    const ERROR_AA_BRANDINGID_TOO_SHORT = -1310;
+    const ERROR_AA_BRANDINGID_TOO_LONG = -1311;
+    const ERROR_AA_BRANDINGID_NOT_NUMBER = -1312;
+    const ERROR_AA_NAME_NULL = -1313;
+    const ERROR_AA_NAME_EMPTY = -1314;
+    const ERROR_AA_NAME_TOO_SHORT = -1315;
+    const ERROR_AA_NAME_TOO_LONG = -1316;
+    const ERROR_AA_BRANDINGID_NOT_HEX = -1317;
+    const ERROR_IL_NOT_AUTHORIZED_TO_IMPORT_BLC = -1318;
 		
-	/*
+    /*
 	 * Branding errors (-1400 to -1499)
 	 */
-	const ERROR_BRANDING_NOT_FOUND = -1400;
-	const ERROR_BRANDING_EMPTY = -1401;
-	const ERROR_BRANDING_INCOMPLETE = -1402;
-	const ERROR_BRANDING_ALREADY_EXIST = -1403;
-	const ERROR_BRANDING_LOADING_NOT_CONFIRMED = -1404;
-	const ERROR_BRANDING_SIGNATURE_NOT_VERIFIED = -1405;
-	const ERROR_BRANDING_SIGNATURE_NOT_HEX = -1406;
-	const ERROR_BRANDING_SIGNATURE_NOT_CALCULATED = -1407;
-	const ERROR_BRANDINGID_NULL = -1408;
-	const ERROR_BRANDINGID_EMPTY = -1409;
-	const ERROR_BRANDINGID_TOO_SHORT = -1410;
-	const ERROR_BRANDINGID_TOO_LONG = -1411;
-	const ERROR_BRANDINGID_NOT_NUMBER = -1412;
-	const ERROR_BRANDING_NAME_NULL = -1413;
-	const ERROR_BRANDING_NAME_EMPTY = -1414;
-	const ERROR_BRANDING_NAME_TOO_SHORT = -1415;
-	const ERROR_BRANDING_NAME_TOO_LONG = -1416;
-	const ERROR_BRANDING_TYPE_UNKNOWN = -1417;
-	const ERROR_POWER_BRANDING_NOT_FOUND = -1418;
-	// error for new branding (version 2) - 10.03.09 crohr
-	const ERROR_KBIN_NOT_SET = -1430;
-	const ERROR_KBIN_LENGTH_NOT_CORRECT = -1431;
-	const ERROR_BRDIG_NOT_VERIFIED = -1432;
-	const ERROR_BISC_NOT_VERIFIED = -1433;
-	const ERROR_CSS_NOT_VERIFIED = -1434;
-	const ERROR_ILN_NOT_VERIFIED = -1435;
-	const ERROR_CSS_INCOMPLETE = -1436;
-	const ERROR_CSS_EMPTY = -1437;
-	const ERROR_CSS_SIGNATURE_NOT_VERIFIED = -1438;
-	const ERROR_BRDIG_SIGNATURE_NOT_VERIFIED = -1439;
-	const ERROR_BRDIG_SIGNATURE_NOT_HEX = -1440;
-	const ERROR_BRANDINGID_NOT_HEX = -1441;
-	const ERROR_OID_LENGTH_NOT_CORRECT = -1442;
-	// the CSS was created for another system (production, enterprise, evaluation, ...)
-	const ERROR_CSS_BELONGS_TO_OTHER_SYSTEM = -1443;
-	// the systemtype in the kbin is not the same as the one in the CSS
-	const ERROR_KBIN_FOR_OTHER_SYSTEM_THAN_CSS = -1444;
-	
-	/*
+    const ERROR_BRANDING_NOT_FOUND = -1400;
+    const ERROR_BRANDING_EMPTY = -1401;
+    const ERROR_BRANDING_INCOMPLETE = -1402;
+    const ERROR_BRANDING_ALREADY_EXIST = -1403;
+    const ERROR_BRANDING_LOADING_NOT_CONFIRMED = -1404;
+    const ERROR_BRANDING_SIGNATURE_NOT_VERIFIED = -1405;
+    const ERROR_BRANDING_SIGNATURE_NOT_HEX = -1406;
+    const ERROR_BRANDING_SIGNATURE_NOT_CALCULATED = -1407;
+    const ERROR_BRANDINGID_NULL = -1408;
+    const ERROR_BRANDINGID_EMPTY = -1409;
+    const ERROR_BRANDINGID_TOO_SHORT = -1410;
+    const ERROR_BRANDINGID_TOO_LONG = -1411;
+    const ERROR_BRANDINGID_NOT_NUMBER = -1412;
+    const ERROR_BRANDING_NAME_NULL = -1413;
+    const ERROR_BRANDING_NAME_EMPTY = -1414;
+    const ERROR_BRANDING_NAME_TOO_SHORT = -1415;
+    const ERROR_BRANDING_NAME_TOO_LONG = -1416;
+    const ERROR_BRANDING_TYPE_UNKNOWN = -1417;
+    const ERROR_POWER_BRANDING_NOT_FOUND = -1418;
+    // error for new branding (version 2) - 10.03.09 crohr
+    const ERROR_KBIN_NOT_SET = -1430;
+    const ERROR_KBIN_LENGTH_NOT_CORRECT = -1431;
+    const ERROR_BRDIG_NOT_VERIFIED = -1432;
+    const ERROR_BISC_NOT_VERIFIED = -1433;
+    const ERROR_CSS_NOT_VERIFIED = -1434;
+    const ERROR_ILN_NOT_VERIFIED = -1435;
+    const ERROR_CSS_INCOMPLETE = -1436;
+    const ERROR_CSS_EMPTY = -1437;
+    const ERROR_CSS_SIGNATURE_NOT_VERIFIED = -1438;
+    const ERROR_BRDIG_SIGNATURE_NOT_VERIFIED = -1439;
+    const ERROR_BRDIG_SIGNATURE_NOT_HEX = -1440;
+    const ERROR_BRANDINGID_NOT_HEX = -1441;
+    const ERROR_OID_LENGTH_NOT_CORRECT = -1442;
+    // the CSS was created for another system (production, enterprise, evaluation, ...)
+    const ERROR_CSS_BELONGS_TO_OTHER_SYSTEM = -1443;
+    // the systemtype in the kbin is not the same as the one in the CSS
+    const ERROR_KBIN_FOR_OTHER_SYSTEM_THAN_CSS = -1444;
+	
+    /*
 	 * Property errors (-1600 to -1699)
 	 */
-	const ERROR_PROPERTY_NOT_NUMBER = -1600;
-	const ERROR_PROPERTY_NOT_SET = -1601;
-	const ERROR_PROPERTY_VALUE_NOT_VALID = -1602;
+    const ERROR_PROPERTY_NOT_NUMBER = -1600;
+    const ERROR_PROPERTY_NOT_SET = -1601;
+    const ERROR_PROPERTY_VALUE_NOT_VALID = -1602;
 	
-	/*
+    /*
 	 * platform errors (-1700 to -1799)
 	 */
-	const ERROR_PLATFORM_OPERATOR_NOT_SET = -1700;
-	const ERROR_PLATFORMID_NULL = -1701;
-	const ERROR_PLATFORMID_EMPTY = -1702;
-	const ERROR_PLATFORMID_NOT_NUMBER = -1703;
-	const ERROR_PLATFORMID_TOO_SHORT = -1704;
-	const ERROR_PLATFORMID_TOO_LONG = -1705;
-	const ERROR_PLATFORM_NAME_NULL = -1706;
-	const ERROR_PLATFORM_NAME_EMPTY = -1707;
-	const ERROR_PLATFORM_NAME_TOO_SHORT = -1708;
-	const ERROR_PLATFORM_NAME_TOO_LONG = -1709;
-	const ERROR_PLATFORMID_LENGTH_NOT_CORRECT = -1710;
-	const ERROR_PLATFORMID_NOT_HEX = -1711;
-	
-	/*
+    const ERROR_PLATFORM_OPERATOR_NOT_SET = -1700;
+    const ERROR_PLATFORMID_NULL = -1701;
+    const ERROR_PLATFORMID_EMPTY = -1702;
+    const ERROR_PLATFORMID_NOT_NUMBER = -1703;
+    const ERROR_PLATFORMID_TOO_SHORT = -1704;
+    const ERROR_PLATFORMID_TOO_LONG = -1705;
+    const ERROR_PLATFORM_NAME_NULL = -1706;
+    const ERROR_PLATFORM_NAME_EMPTY = -1707;
+    const ERROR_PLATFORM_NAME_TOO_SHORT = -1708;
+    const ERROR_PLATFORM_NAME_TOO_LONG = -1709;
+    const ERROR_PLATFORMID_LENGTH_NOT_CORRECT = -1710;
+    const ERROR_PLATFORMID_NOT_HEX = -1711;
+	
+    /*
 	 * XML errors (-1800 to -1899)
 	 */
-	const ERROR_XML_DATA_NOT_EXPORTED = -1800;
-	const ERROR_XML_DATA_NOT_PARSED = -1801;
-	const ERROR_XML_DATA_NOT_IMPORTED = -1802;
-	const ERROR_XML_DATA_NULL = -1803;
-	const ERROR_XML_DATA_EMPTY = -1804;
+    const ERROR_XML_DATA_NOT_EXPORTED = -1800;
+    const ERROR_XML_DATA_NOT_PARSED = -1801;
+    const ERROR_XML_DATA_NOT_IMPORTED = -1802;
+    const ERROR_XML_DATA_NULL = -1803;
+    const ERROR_XML_DATA_EMPTY = -1804;
 
-	/*
+    /*
 	 * TCS errors (-1900 to -1999)
 	 */
-	const ERROR_TCS_FILE_NOT_ENCRYPTED = -1900;
-	const ERROR_TCS_FILE_SIGNATURE_NOT_CREATED = -1901;
-	const ERROR_TCS_FILE_NOT_READABLE = -1902;
-	const ERROR_TCS_FILE_STRUCTURE_NOT_VALID = -1903;
-	const ERROR_TCS_SIGNATURE_NOT_VERIFIED = -1904;
-	const ERROR_TCS_SIGNATURE_NOT_VERIFIED_DATA_NOT_VALID = -1905;
-	const ERROR_TCS_SIGNATURE_NOT_VERIFIED_CERTIFICATE_NOT_USABLE = -1906;
-	const ERROR_TCS_SIGNATURE_NOT_VERIFIED_SIGNATURE_ALGORITHM_NOT_AVAILABLE = -1907;
-	const ERROR_TCS_DATA_ENCRYPTION_ALGORITHM_NOT_AVAILABLE = -1908;
-	const ERROR_TCS_DATA_NOT_IMPORTED = -1909;
-	const ERROR_TCS_DATA_PRIVATE_KEY_INVALID = -1910;
-	
-	/*
+    const ERROR_TCS_FILE_NOT_ENCRYPTED = -1900;
+    const ERROR_TCS_FILE_SIGNATURE_NOT_CREATED = -1901;
+    const ERROR_TCS_FILE_NOT_READABLE = -1902;
+    const ERROR_TCS_FILE_STRUCTURE_NOT_VALID = -1903;
+    const ERROR_TCS_SIGNATURE_NOT_VERIFIED = -1904;
+    const ERROR_TCS_SIGNATURE_NOT_VERIFIED_DATA_NOT_VALID = -1905;
+    const ERROR_TCS_SIGNATURE_NOT_VERIFIED_CERTIFICATE_NOT_USABLE = -1906;
+    const ERROR_TCS_SIGNATURE_NOT_VERIFIED_SIGNATURE_ALGORITHM_NOT_AVAILABLE = -1907;
+    const ERROR_TCS_DATA_ENCRYPTION_ALGORITHM_NOT_AVAILABLE = -1908;
+    const ERROR_TCS_DATA_NOT_IMPORTED = -1909;
+    const ERROR_TCS_DATA_PRIVATE_KEY_INVALID = -1910;
+	
+    /*
 	 * Production lot errors (-2000 to -2099)
 	 */
-	const ERROR_PRODUCTION_LOT_NOT_FOUND = -2000;
-	const ERROR_LOT_NUMBER_NEGATIVE = -2001;
-	const ERROR_LOT_NUMBER_ALREADY_EXISTS = -2002;
+    const ERROR_PRODUCTION_LOT_NOT_FOUND = -2000;
+    const ERROR_LOT_NUMBER_NEGATIVE = -2001;
+    const ERROR_LOT_NUMBER_ALREADY_EXISTS = -2002;
 			
-	/*
+    /*
 	 *  Keystore and TPS errors (-2100 to -2199)
 	 */
-	const ERROR_KEYSTORE_NOT_FOUND = -2100;
-	const ERROR_KEYSTORE_LOCATION_NOT_SET_OR_EMPTY = -2101;
-	const ERROR_KEYSTORE_PASSWORD_NOT_SET_OR_EMPTY = -2102;
-	const ERROR_KEYSTORE_NOT_LOADED = -2103;
-	const ERROR_KEYSTORE_KEY_NOT_LOADED = -2104;
-	const ERROR_AXS_CERTIFICATE_NOT_FOUND = -2105;
-	const ERROR_COULD_NOT_GET_CERTIFICATE = -2106;
-	const ERROR_COULD_NOT_GET_PUBLIC_KEY = -2107;
-	const ERROR_TPS_KEY_NOT_LOADED_FROM_KEYSTORE = -2108;
-	const ERROR_TPS_CERTIFICATE_NOT_LOADED_FROM_KEYSTORE = -2109;
-	const ERROR_TPS_SERVER_CONNECTION = -2110;
-	const ERROR_TPS_KEY_NOT_EXPORTED = -2111;
-	const ERROR_TPS_OTBLC_NOT_CREATED = -2112;
+    const ERROR_KEYSTORE_NOT_FOUND = -2100;
+    const ERROR_KEYSTORE_LOCATION_NOT_SET_OR_EMPTY = -2101;
+    const ERROR_KEYSTORE_PASSWORD_NOT_SET_OR_EMPTY = -2102;
+    const ERROR_KEYSTORE_NOT_LOADED = -2103;
+    const ERROR_KEYSTORE_KEY_NOT_LOADED = -2104;
+    const ERROR_AXS_CERTIFICATE_NOT_FOUND = -2105;
+    const ERROR_COULD_NOT_GET_CERTIFICATE = -2106;
+    const ERROR_COULD_NOT_GET_PUBLIC_KEY = -2107;
+    const ERROR_TPS_KEY_NOT_LOADED_FROM_KEYSTORE = -2108;
+    const ERROR_TPS_CERTIFICATE_NOT_LOADED_FROM_KEYSTORE = -2109;
+    const ERROR_TPS_SERVER_CONNECTION = -2110;
+    const ERROR_TPS_KEY_NOT_EXPORTED = -2111;
+    const ERROR_TPS_OTBLC_NOT_CREATED = -2112;
 
-	/*
+    /*
 	 * Data errors (-2200 to -2399)
 	 */
 	
-	// Codebook errors
-	const ERROR_CODEBOOK_ENTRY_NOT_FOUND = -2200;
-	const ERROR_CODEBOOK_NUMBER_OF_ENTRIES_DO_NOT_MATCH = -2201;
-	const ERROR_CODEBOOK_ENTRY_LENGTH_NOT_VALID = -2202;
+    // Codebook errors
+    const ERROR_CODEBOOK_ENTRY_NOT_FOUND = -2200;
+    const ERROR_CODEBOOK_NUMBER_OF_ENTRIES_DO_NOT_MATCH = -2201;
+    const ERROR_CODEBOOK_ENTRY_LENGTH_NOT_VALID = -2202;
 		
-	// FingerCode errors
-	const ERROR_FINGERCODE_NULL = -2210;
-	const ERROR_FINGERCODE_TOO_SHORT = -2211;
-	const ERROR_FINGERCODE_TOO_LONG = -2212;
-	const ERROR_FINGERCODE_INVALID_SYMBOLS = -2213;
-	const ERROR_FINGERCODE_CHAR_REPETITION = -2214;
-	const ERROR_FINGERCODE_VIOLATES_DOMAIN = -2215;
-	
-	// PIN errors
-	const ERROR_PIN_LENGTH_OUT_OF_BOUNDS = -2220;
-	const ERROR_PIN_LENGTH_FINGERCODE_NOT_SET = -2221;
-	
-	// Text payload errors
-	const ERROR_TEXT_PAYLOAD_NULL = -2230;
-	const ERROR_TEXT_PAYLOAD_EMPTY = -2231;
-	const ERROR_TEXT_PAYLOAD_TOO_LONG = -2232;
-	const ERROR_TEXT_CONTAINS_NON_DISPLAYABLE_CHARACTER = -2233;
-	const ERROR_TEXT_TOO_MANY_LINES = -2234;
-	
-	// AclRequested errors
-	const ERROR_ACL_REQUESTED_NULL = -2250;
-	const ERROR_ACL_REQUESTED_EMPTY = -2251;
-	const ERROR_ACL_REQUESTED_TOO_SHORT = -2252;
-	const ERROR_ACL_REQUESTED_TOO_LONG = -2253;
-	const ERROR_ACL_REQUESTED_NOT_HEX = -2254;
-	
-	// Description errors
-	const ERROR_DESCRIPTION_TOO_LONG = -2270;
-	
-	// Data errors
-	const ERROR_DATA_NULL = -2280;
-	const ERROR_DATA_EMPTY = -2281;
-	const ERROR_DATA_TOO_LONG = -2282;
-	const ERROR_DATA_NOT_HEX = -2283;
-	
-	// AuthenticationLevel error
-	const ERROR_AUTHENTICATION_LEVEL_OUT_OF_BOUNDS = -2290;
-	
-	// ReturnPath error
-	const ERROR_RETURN_PATH_OUT_OF_BOUNDS = -2300;
-	
-	// min_aut_lev error
-	const ERROR_MIN_AUT_LEV_OUT_OF_BOUNDS = -2310;
-	
-	// HexData errors
-	const ERROR_HEX_DATA_NULL = -2320;
-	const ERROR_HEX_DATA_NOT_HEX = -2321;
+    // FingerCode errors
+    const ERROR_FINGERCODE_NULL = -2210;
+    const ERROR_FINGERCODE_TOO_SHORT = -2211;
+    const ERROR_FINGERCODE_TOO_LONG = -2212;
+    const ERROR_FINGERCODE_INVALID_SYMBOLS = -2213;
+    const ERROR_FINGERCODE_CHAR_REPETITION = -2214;
+    const ERROR_FINGERCODE_VIOLATES_DOMAIN = -2215;
+	
+    // PIN errors
+    const ERROR_PIN_LENGTH_OUT_OF_BOUNDS = -2220;
+    const ERROR_PIN_LENGTH_FINGERCODE_NOT_SET = -2221;
+	
+    // Text payload errors
+    const ERROR_TEXT_PAYLOAD_NULL = -2230;
+    const ERROR_TEXT_PAYLOAD_EMPTY = -2231;
+    const ERROR_TEXT_PAYLOAD_TOO_LONG = -2232;
+    const ERROR_TEXT_CONTAINS_NON_DISPLAYABLE_CHARACTER = -2233;
+    const ERROR_TEXT_TOO_MANY_LINES = -2234;
+	
+    // AclRequested errors
+    const ERROR_ACL_REQUESTED_NULL = -2250;
+    const ERROR_ACL_REQUESTED_EMPTY = -2251;
+    const ERROR_ACL_REQUESTED_TOO_SHORT = -2252;
+    const ERROR_ACL_REQUESTED_TOO_LONG = -2253;
+    const ERROR_ACL_REQUESTED_NOT_HEX = -2254;
+	
+    // Description errors
+    const ERROR_DESCRIPTION_TOO_LONG = -2270;
+	
+    // Data errors
+    const ERROR_DATA_NULL = -2280;
+    const ERROR_DATA_EMPTY = -2281;
+    const ERROR_DATA_TOO_LONG = -2282;
+    const ERROR_DATA_NOT_HEX = -2283;
+	
+    // AuthenticationLevel error
+    const ERROR_AUTHENTICATION_LEVEL_OUT_OF_BOUNDS = -2290;
+	
+    // ReturnPath error
+    const ERROR_RETURN_PATH_OUT_OF_BOUNDS = -2300;
+	
+    // min_aut_lev error
+    const ERROR_MIN_AUT_LEV_OUT_OF_BOUNDS = -2310;
+	
+    // HexData errors
+    const ERROR_HEX_DATA_NULL = -2320;
+    const ERROR_HEX_DATA_NOT_HEX = -2321;
 		
-	// BRAK errors
-	const ERROR_BRAK_NOT_SET = -2330;
-	const ERROR_BRAK_LENGTH_NOT_CORRECT = -2331;
-	const ERROR_BARS_LENGTH_NOT_CORRECT = -2332;
+    // BRAK errors
+    const ERROR_BRAK_NOT_SET = -2330;
+    const ERROR_BRAK_LENGTH_NOT_CORRECT = -2331;
+    const ERROR_BARS_LENGTH_NOT_CORRECT = -2332;
 
-	// BRAC errors
-	const ERROR_BRAC_NULL = -2340;
-	const ERROR_BRAC_EMPTY = -2341;
-	const ERROR_BRAC_NOT_HEX = -2342;
-	
-	// OTBLC errors
-	const ERROR_OTBLC_NOT_FOUND = -2350;
-	const ERROR_OTBLC_NULL = -2351;
-	const ERROR_OTBLC_EMPTY = -2352;
-	const ERROR_OTBLC_TOO_SHORT = -2353;
-	const ERROR_OTBLC_TOO_LONG = -2354;
-	const ERROR_OTBLC_NOT_HEX = -2355;
-	const ERROR_OTBLC_DIFFERENT = -2356;
-	
-	// BLC nonce errors
-	const ERROR_BLC_NONCE_FORMAT_NOT_CORRECT = -2360;
-	const ERROR_BLC_NONCE_NULL_OR_EMPTY = -2361;
-	
-	// enrolment type error
-	const ERROR_ENROLMENT_TYPE_UNKNOWN = -2370;
-	
-	// lock errors
-	const ERROR_LOCKING_REASON_NULL = -2380;
-	const ERROR_LOCKING_REASON_EMPTY = -2381;
-	const ERROR_UNLOCKING_REASON_NULL = -2382;
-	const ERROR_UNLOCKING_REASON_EMPTY = -2383;	
-	
-	// idT error
-	const ERROR_IDT_INVALID = -2390;
-	
-	/*
+    // BRAC errors
+    const ERROR_BRAC_NULL = -2340;
+    const ERROR_BRAC_EMPTY = -2341;
+    const ERROR_BRAC_NOT_HEX = -2342;
+	
+    // OTBLC errors
+    const ERROR_OTBLC_NOT_FOUND = -2350;
+    const ERROR_OTBLC_NULL = -2351;
+    const ERROR_OTBLC_EMPTY = -2352;
+    const ERROR_OTBLC_TOO_SHORT = -2353;
+    const ERROR_OTBLC_TOO_LONG = -2354;
+    const ERROR_OTBLC_NOT_HEX = -2355;
+    const ERROR_OTBLC_DIFFERENT = -2356;
+	
+    // BLC nonce errors
+    const ERROR_BLC_NONCE_FORMAT_NOT_CORRECT = -2360;
+    const ERROR_BLC_NONCE_NULL_OR_EMPTY = -2361;
+	
+    // enrolment type error
+    const ERROR_ENROLMENT_TYPE_UNKNOWN = -2370;
+	
+    // lock errors
+    const ERROR_LOCKING_REASON_NULL = -2380;
+    const ERROR_LOCKING_REASON_EMPTY = -2381;
+    const ERROR_UNLOCKING_REASON_NULL = -2382;
+    const ERROR_UNLOCKING_REASON_EMPTY = -2383;	
+	
+    // idT error
+    const ERROR_IDT_INVALID = -2390;
+	
+    /*
 	 * User errors (-2400 to -2479)
 	 */
-	const ERROR_USER_NOT_FOUND = -2400;
-	const ERROR_GROUP_NOT_FOUND = -2401;
-	const ERROR_USERNAME_AND_AAID_CANNOT_BE_THE_SAME = -2402;
-	const ERROR_USER_ALREADY_CREATED = -2403;
-	const ERROR_GROUP_ALREADY_EXIST = -2404;
-	const ERROR_USER_ALREADY_ASSIGNED_TO_AAID = -2405;
-	const ERROR_USER_ALREADY_ASSIGNED_TO_GROUP = -2406;
-	const ERROR_USER_ALREADY_REMOVED_FROM_GROUP = -2407;
-	const ERROR_USER_CAN_NOT_BE_DELETED = -2408;
-	const ERROR_USERNAME_NOT_CORRECT = -2409; 
-	const ERROR_USERNAME_AAID_NOT_CORRECT = -2410;
-	const ERROR_USERNAME_GROUPNAME_NOT_CORRECT = -2411;
-	const ERROR_GROUPNAME_NOT_CORRECT = -2412;
-	const ERROR_PASSWORD_NOT_CORRECT = -2413;
-	const ERROR_USERNAME_PASSWORD_NOT_SET = -2414;
-	const ERROR_GROUPS_EMPTY = -2415;
-	const ERROR_DEFAULT_ADMIN_USER_NOT_FOUND = -2416;
-	const ERROR_DEFAULT_ADMIN_USER_NOT_VALID = -2417;
-	const ERROR_DEFAULT_ADMIN_USER_CAN_NOT_BE_DELETED = -2418;
-	const ERROR_DEFAULT_ADMIN_USER_CANNOT_BE_REMOVED_FROM_GROUP = -2419;
-	const ERROR_DEFAULT_ADMIN_USER_ALREADY_CREATED = -2420;
-	const ERROR_PASSWORD_OF_DEFAULT_ADMIN_USER_NOT_CHANGED = -2421;
-	const ERROR_PERMISSION_DENIED = -2422;
+    const ERROR_USER_NOT_FOUND = -2400;
+    const ERROR_GROUP_NOT_FOUND = -2401;
+    const ERROR_USERNAME_AND_AAID_CANNOT_BE_THE_SAME = -2402;
+    const ERROR_USER_ALREADY_CREATED = -2403;
+    const ERROR_GROUP_ALREADY_EXIST = -2404;
+    const ERROR_USER_ALREADY_ASSIGNED_TO_AAID = -2405;
+    const ERROR_USER_ALREADY_ASSIGNED_TO_GROUP = -2406;
+    const ERROR_USER_ALREADY_REMOVED_FROM_GROUP = -2407;
+    const ERROR_USER_CAN_NOT_BE_DELETED = -2408;
+    const ERROR_USERNAME_NOT_CORRECT = -2409; 
+    const ERROR_USERNAME_AAID_NOT_CORRECT = -2410;
+    const ERROR_USERNAME_GROUPNAME_NOT_CORRECT = -2411;
+    const ERROR_GROUPNAME_NOT_CORRECT = -2412;
+    const ERROR_PASSWORD_NOT_CORRECT = -2413;
+    const ERROR_USERNAME_PASSWORD_NOT_SET = -2414;
+    const ERROR_GROUPS_EMPTY = -2415;
+    const ERROR_DEFAULT_ADMIN_USER_NOT_FOUND = -2416;
+    const ERROR_DEFAULT_ADMIN_USER_NOT_VALID = -2417;
+    const ERROR_DEFAULT_ADMIN_USER_CAN_NOT_BE_DELETED = -2418;
+    const ERROR_DEFAULT_ADMIN_USER_CANNOT_BE_REMOVED_FROM_GROUP = -2419;
+    const ERROR_DEFAULT_ADMIN_USER_ALREADY_CREATED = -2420;
+    const ERROR_PASSWORD_OF_DEFAULT_ADMIN_USER_NOT_CHANGED = -2421;
+    const ERROR_PERMISSION_DENIED = -2422;
 
-	/*
+    /*
 	 * Configuration errors (-2480 to -2499)
 	 */
-	const ERROR_CONFIGURATION_NOT_FOUND = -2480;
-	const ERROR_CONFIGURATION_ITEM_NOT_FOUND = -2481;
-	const ERROR_CONFIGURATION_NAME_TOO_SHORT = -2482;
-	const ERROR_CONFIGURATION_NAME_TOO_LONG = -2483;
-	const ERROR_CONFIGURATION_DESCRIPTION_TOO_LONG = -2484;
-	const ERROR_CONFIGURATION_TYPE_OUT_OF_BOUNDS = -2485;
-	const ERROR_CONFIGURATION_POSITION_OUT_OF_BOUNDS = -2486;
-	const ERROR_CONFIGURATION_ALREADY_EXIST = -2487;
-	const ERROR_CONFIGURATION_ITEM_NAME_TOO_LONG = -2488;
-	const ERROR_CONFIGURATION_ITEM_ALREADY_EXIST = -2489;
-	
-	/*
+    const ERROR_CONFIGURATION_NOT_FOUND = -2480;
+    const ERROR_CONFIGURATION_ITEM_NOT_FOUND = -2481;
+    const ERROR_CONFIGURATION_NAME_TOO_SHORT = -2482;
+    const ERROR_CONFIGURATION_NAME_TOO_LONG = -2483;
+    const ERROR_CONFIGURATION_DESCRIPTION_TOO_LONG = -2484;
+    const ERROR_CONFIGURATION_TYPE_OUT_OF_BOUNDS = -2485;
+    const ERROR_CONFIGURATION_POSITION_OUT_OF_BOUNDS = -2486;
+    const ERROR_CONFIGURATION_ALREADY_EXIST = -2487;
+    const ERROR_CONFIGURATION_ITEM_NAME_TOO_LONG = -2488;
+    const ERROR_CONFIGURATION_ITEM_ALREADY_EXIST = -2489;
+	
+    /*
 	 * Generator errors (-2500 to -2599)
 	 */
-	const ERROR_BAC_GENERATOR_NOT_INITIALIZED = -2500;
-	const ERROR_FLICKERING_GENERATOR_NOT_FOUND = -2501;
-	const ERROR_MESSAGE_GENERATOR_NOT_FOUND = -2502;
-	const ERROR_CODEBOOK_GENERATOR_NOT_INITIALIZED = -2503;
-	const ERROR_DEBUG_MESSAGE_GENERATOR_NOT_FOUND = -2504;
-	const ERROR_TCS_GENERATOR_CLASS_NOT_VALID = -2505;
-	const ERROR_TCS_GENERATOR_NOT_CREATED = -2506;
-	
-	/*
+    const ERROR_BAC_GENERATOR_NOT_INITIALIZED = -2500;
+    const ERROR_FLICKERING_GENERATOR_NOT_FOUND = -2501;
+    const ERROR_MESSAGE_GENERATOR_NOT_FOUND = -2502;
+    const ERROR_CODEBOOK_GENERATOR_NOT_INITIALIZED = -2503;
+    const ERROR_DEBUG_MESSAGE_GENERATOR_NOT_FOUND = -2504;
+    const ERROR_TCS_GENERATOR_CLASS_NOT_VALID = -2505;
+    const ERROR_TCS_GENERATOR_NOT_CREATED = -2506;
+	
+    /*
 	 * Other errors (-2600 to -xxxx)
 	 */
-	const ERROR_DOS_TIMELIMIT = -2600;
-	const ERROR_IO = -2601;
-	const ERROR_WSDL_LOCATION_PROPERTY_NOT_SET = -2602;
-	const ERROR_AXS_UPDATER_SERVICE_NOT_CALLED = -2603;
-	const ERROR_DOMAIN_VIOLATION_BY_UPDATE_SESSION_SEED = -2604;
-	const ERROR_CREATE_CORE_WITH_EXISTING_USCN = -2605;
-	
-	/*
+    const ERROR_DOS_TIMELIMIT = -2600;
+    const ERROR_IO = -2601;
+    const ERROR_WSDL_LOCATION_PROPERTY_NOT_SET = -2602;
+    const ERROR_AXS_UPDATER_SERVICE_NOT_CALLED = -2603;
+    const ERROR_DOMAIN_VIOLATION_BY_UPDATE_SESSION_SEED = -2604;
+    const ERROR_CREATE_CORE_WITH_EXISTING_USCN = -2605;
+	
+    /*
 	 * Roaming errors (-2700 to -2799)
 	 */
-	// configuration problems
-	const ERROR_KEYFETCHING_NOT_CONFIGURED = -2700;
-	// connection problems sm - cm
-	const ERROR_KEYFETCHING_SM_CANNOT_CONNECT_TO_CM_WSDL_WRONG = -2710;
-	const ERROR_KEYFETCHING_SM_CANNOT_CONNECT_TO_CM_NOT_AUTHORIZED = -2711;
+    // configuration problems
+    const ERROR_KEYFETCHING_NOT_CONFIGURED = -2700;
+    // connection problems sm - cm
+    const ERROR_KEYFETCHING_SM_CANNOT_CONNECT_TO_CM_WSDL_WRONG = -2710;
+    const ERROR_KEYFETCHING_SM_CANNOT_CONNECT_TO_CM_NOT_AUTHORIZED = -2711;
 	
-	// errors outside of this server
-	const ERROR_KEYFETCHING_PERMANENT_ERROR_OUTSIDE_OF_THIS_SERVER = -2720;
-	const ERROR_KEYFETCHING_TEMPORARY_ERROR_OUTSIDE_OF_THIS_SERVER = -2721;
+    // errors outside of this server
+    const ERROR_KEYFETCHING_PERMANENT_ERROR_OUTSIDE_OF_THIS_SERVER = -2720;
+    const ERROR_KEYFETCHING_TEMPORARY_ERROR_OUTSIDE_OF_THIS_SERVER = -2721;
 	
-	// timeouts
-	const ERROR_KEYFETCHING_TIMEOUT_ON_SERVER = -2730;
+    // timeouts
+    const ERROR_KEYFETCHING_TIMEOUT_ON_SERVER = -2730;
 	
-	const ERROR_KEYSTORE_LOCATION_NOT_CORRECT = -2740;
+    const ERROR_KEYSTORE_LOCATION_NOT_CORRECT = -2740;
 		
-	/* removed 2009-02-18 - crohr	
+    /* removed 2009-02-18 - crohr	
 	 * The error does not occur anymore
 	 * const ERROR_SERVER_TIMEOUT = -3000;
 	 */	
-	const ERROR_WEBSERVICE = -3001;
-	const ERROR_DATABASE_CORRUPTED = -3002;
-	const ERROR_WSDL_URL_NOT_ACCESSIBLE = -3003;
-	const ERROR_PARAMETER_NULL = -4000;
-	const ERROR_PARAMETER_EMPTY = -4001;
-	const ERROR_PARAMETER_TOO_LONG = -4002;
+    const ERROR_WEBSERVICE = -3001;
+    const ERROR_DATABASE_CORRUPTED = -3002;
+    const ERROR_WSDL_URL_NOT_ACCESSIBLE = -3003;
+    const ERROR_PARAMETER_NULL = -4000;
+    const ERROR_PARAMETER_EMPTY = -4001;
+    const ERROR_PARAMETER_TOO_LONG = -4002;
 	
-	const ERROR_METHOD_NOT_SUPPORTED_ANYMORE = -5000;
+    const ERROR_METHOD_NOT_SUPPORTED_ANYMORE = -5000;
 	
-	const ERROR_FORWARD_SECURITY_NEWS_NOT_FOUND = -5100;
-	const ERROR_NEWS_NOT_SUPPORTED = -5101;
+    const ERROR_FORWARD_SECURITY_NEWS_NOT_FOUND = -5100;
+    const ERROR_NEWS_NOT_SUPPORTED = -5101;
 		
-	const ERROR_UNDEFINED = -9999;
+    const ERROR_UNDEFINED = -9999;
 }
 ?>
\ No newline at end of file

includes/libraries/Authentication/agses/axs/AXSILPortal_V1_Auth.php

Indentation +34 added lines, -34 removed lines

@@ -1,54 +1,54 @@
 <?php 
 class AXSILPortal_V1_Auth { 
-	var $server;
+    var $server;
 
-	private $url = "";
-	private $AAId = "";
-	private $apiKey = "";
+    private $url = "";
+    private $AAId = "";
+    private $apiKey = "";
 	
-	private $baseUrl = "";
+    private $baseUrl = "";
 	
-	function setUrl($url) {
-		$this->url = $url;
-	}
+    function setUrl($url) {
+        $this->url = $url;
+    }
 	
-	function setAAId($AAId) {
-		$this->AAId = $AAId;
-	}
+    function setAAId($AAId) {
+        $this->AAId = $AAId;
+    }
 	
-	function setApiKey($apiKey) {
-		$this->apiKey = $apiKey;
-	}
+    function setApiKey($apiKey) {
+        $this->apiKey = $apiKey;
+    }
 	
 	
-	// Verify that you can open the URL from the web server.
-	function create() { 
-		if ($this->url != "" && $this->AAId != "" && $this->apiKey != "") {
-			$this->baseUrl = $this->url."".$this->apiKey."/".$this->AAId;
-		} else {
-			die("Cannot initialize Agses webservice without credentials, please set them in settings");
-		}
-	}
+    // Verify that you can open the URL from the web server.
+    function create() { 
+        if ($this->url != "" && $this->AAId != "" && $this->apiKey != "") {
+            $this->baseUrl = $this->url."".$this->apiKey."/".$this->AAId;
+        } else {
+            die("Cannot initialize Agses webservice without credentials, please set them in settings");
+        }
+    }
 	
-	function createAuthenticationMessage($apn, $createFlickerCode, $returnPath, $authenticationLevel, $hedgeId) {
+    function createAuthenticationMessage($apn, $createFlickerCode, $returnPath, $authenticationLevel, $hedgeId) {
 		
-		$serviceCall = $this->baseUrl."/authmessage/".$apn."/create/".$hedgeId;
+        $serviceCall = $this->baseUrl."/authmessage/".$apn."/create/".$hedgeId;
 		
-		$json = file_get_contents($serviceCall);
-		$response = json_decode($json,true);		
+        $json = file_get_contents($serviceCall);
+        $response = json_decode($json,true);		
 		
-		return $response['flickerCode'];
-	}
+        return $response['flickerCode'];
+    }
 	
-	function verifyResponse($apn, $response, $hedgeId) {
+    function verifyResponse($apn, $response, $hedgeId) {
 		
-		$serviceCall = $this->baseUrl."/authmessage/".$apn."/verify/".$hedgeId."/".$response;
+        $serviceCall = $this->baseUrl."/authmessage/".$apn."/verify/".$hedgeId."/".$response;
 		
-		$json = file_get_contents($serviceCall);
-		$response = json_decode($json,true);
+        $json = file_get_contents($serviceCall);
+        $response = json_decode($json,true);
 		
-		return $response['response'];
-	}
+        return $response['response'];
+    }
 
 } 
 ?>
\ No newline at end of file

includes/libraries/Authentication/agses/axs/axs/code2gif.php

Indentation +53 added lines, -53 removed lines

@@ -43,73 +43,73 @@
      *                 created gif files by almost 50%.
      */
 
-	// path to data files
-	$path = './images_gif';
+    // path to data files
+    $path = './images_gif';
 	
-	// get code from GET request, use dummy pattern if code not defined
-	$code = isset($_GET['code']) ? $_GET['code'] : '20100804020102040810';
+    // get code from GET request, use dummy pattern if code not defined
+    $code = isset($_GET['code']) ? $_GET['code'] : '20100804020102040810';
 
-	// get frame delay from GET request, default to "safe speed" if delay not
-	// defined or invalid. delay is specified in ms in the request and needs
-	// to be converted to 1/100s for use in GIF files
-	$delay = isset($_GET['delay']) ? ($_GET['delay']+0)/10 : 8;
-	$delay = ($delay > 0) ? $delay : 8;
+    // get frame delay from GET request, default to "safe speed" if delay not
+    // defined or invalid. delay is specified in ms in the request and needs
+    // to be converted to 1/100s for use in GIF files
+    $delay = isset($_GET['delay']) ? ($_GET['delay']+0)/10 : 8;
+    $delay = ($delay > 0) ? $delay : 8;
 
-	// code string must only contain hex characters, code length is limited to
-	// 1024 characters (512 frames)
-	$codelen = strlen($code);
-	if ( ctype_xdigit($code) && $codelen < 1024 ) {
+    // code string must only contain hex characters, code length is limited to
+    // 1024 characters (512 frames)
+    $codelen = strlen($code);
+    if ( ctype_xdigit($code) && $codelen < 1024 ) {
 	
-		// get prepared gif file header
-		$gif  = file_get_contents($path.'/head.bin');
+        // get prepared gif file header
+        $gif  = file_get_contents($path.'/head.bin');
 		
-		// build graphic control extension block
-		// disposal method   = 0
-		// transparent color = 255
-		$ext = "\x21\xf9\x04\x01".chr($delay&0xff).chr(($delay>>8)&0xff)."\xff\x00";
+        // build graphic control extension block
+        // disposal method   = 0
+        // transparent color = 255
+        $ext = "\x21\xf9\x04\x01".chr($delay&0xff).chr(($delay>>8)&0xff)."\xff\x00";
 		
-		// output image header
-		header('Content-type:image/gif');
-		print($gif);
+        // output image header
+        header('Content-type:image/gif');
+        print($gif);
 	
-		// append image data blocks as necessary
-		$size = filesize($path.'/data.bin');
-		$data = fopen($path.'/data.bin','r');
-		if ($data) {
+        // append image data blocks as necessary
+        $size = filesize($path.'/data.bin');
+        $data = fopen($path.'/data.bin','r');
+        if ($data) {
 
-			// load the index from the data file and unpack it into a PHP array.
-			// the index array contains the file offsets of the 4096 delta and
-			// base images inside the data file.
-			$index = unpack("V*", fread($data, 64*64*4));
+            // load the index from the data file and unpack it into a PHP array.
+            // the index array contains the file offsets of the 4096 delta and
+            // base images inside the data file.
+            $index = unpack("V*", fread($data, 64*64*4));
 
-			// when a code is repeated (prev and curr have the same value) a
-			// base image is inserted instead of a delta image. the first frame
-			// in the animation must be a base image, so we peek at the flicker
-			// code and set $prev to the first value in the string
-			$prev = hexdec(substr($code, 0, 2));
-			for ($i = 0; $i < $codelen; $i+=2) {
+            // when a code is repeated (prev and curr have the same value) a
+            // base image is inserted instead of a delta image. the first frame
+            // in the animation must be a base image, so we peek at the flicker
+            // code and set $prev to the first value in the string
+            $prev = hexdec(substr($code, 0, 2));
+            for ($i = 0; $i < $codelen; $i+=2) {
 
-				// get current code
-				$curr = hexdec(substr($code, $i, 2));
+                // get current code
+                $curr = hexdec(substr($code, $i, 2));
 						
-				// locate image block in data file
-				$blockIdx = $prev*64+$curr+1;	// array starts at 1
-				$blockPos = $index[$blockIdx];
-				$blockLen = ($blockIdx < 4096 ? $index[$blockIdx+1] : $size) - $blockPos;
+                // locate image block in data file
+                $blockIdx = $prev*64+$curr+1;	// array starts at 1
+                $blockPos = $index[$blockIdx];
+                $blockLen = ($blockIdx < 4096 ? $index[$blockIdx+1] : $size) - $blockPos;
 				
-				// output extension header
-				print($ext);
+                // output extension header
+                print($ext);
 
-				// output image block
-				fseek($data, $blockPos);
-				print(fread($data, $blockLen));
+                // output image block
+                fseek($data, $blockPos);
+                print(fread($data, $blockLen));
 			
-				$prev = $curr;
-			}
+                $prev = $curr;
+            }
 
-			// file terminator
-			print(";");
-		}
-	}
+            // file terminator
+            print(";");
+        }
+    }
     /******/
 ?>
\ No newline at end of file

includes/libraries/Authentication/phpseclib/Crypt/Hash.php

Indentation +6 added lines, -6 removed lines

@@ -336,16 +336,16 @@
             // Extend the sixteen 32-bit words into eighty 32-bit words
             for ($i = 16; $i < 80; $i++) {
                 $temp = array(
-                          $w[$i - 15]->bitwise_rightRotate(1),
-                          $w[$i - 15]->bitwise_rightRotate(8),
-                          $w[$i - 15]->bitwise_rightShift(7)
+                            $w[$i - 15]->bitwise_rightRotate(1),
+                            $w[$i - 15]->bitwise_rightRotate(8),
+                            $w[$i - 15]->bitwise_rightShift(7)
                 );
                 $s0 = $temp[0]->bitwise_xor($temp[1]);
                 $s0 = $s0->bitwise_xor($temp[2]);
                 $temp = array(
-                          $w[$i - 2]->bitwise_rightRotate(19),
-                          $w[$i - 2]->bitwise_rightRotate(61),
-                          $w[$i - 2]->bitwise_rightShift(6)
+                            $w[$i - 2]->bitwise_rightRotate(19),
+                            $w[$i - 2]->bitwise_rightRotate(61),
+                            $w[$i - 2]->bitwise_rightShift(6)
                 );
                 $s1 = $temp[0]->bitwise_xor($temp[1]);
                 $s1 = $s1->bitwise_xor($temp[2]);

includes/libraries/Authentication/phpseclib/Crypt/Twofish.php

Indentation +53 added lines, -53 removed lines

@@ -464,13 +464,13 @@ 
                 list($s3, $s2, $s1, $s0) = $this->_mdsrem($le_longs[3], $le_longs[4]);
                 for ($i = 0, $j = 1; $i < 40; $i+= 2, $j+= 2) {
                     $A = $m0[$q0[$q0[$i] ^ $key[ 9]] ^ $key[1]] ^
-                         $m1[$q0[$q1[$i] ^ $key[10]] ^ $key[2]] ^
-                         $m2[$q1[$q0[$i] ^ $key[11]] ^ $key[3]] ^
-                         $m3[$q1[$q1[$i] ^ $key[12]] ^ $key[4]];
+                            $m1[$q0[$q1[$i] ^ $key[10]] ^ $key[2]] ^
+                            $m2[$q1[$q0[$i] ^ $key[11]] ^ $key[3]] ^
+                            $m3[$q1[$q1[$i] ^ $key[12]] ^ $key[4]];
                     $B = $m0[$q0[$q0[$j] ^ $key[13]] ^ $key[5]] ^
-                         $m1[$q0[$q1[$j] ^ $key[14]] ^ $key[6]] ^
-                         $m2[$q1[$q0[$j] ^ $key[15]] ^ $key[7]] ^
-                         $m3[$q1[$q1[$j] ^ $key[16]] ^ $key[8]];
+                            $m1[$q0[$q1[$j] ^ $key[14]] ^ $key[6]] ^
+                            $m2[$q1[$q0[$j] ^ $key[15]] ^ $key[7]] ^
+                            $m3[$q1[$q1[$j] ^ $key[16]] ^ $key[8]];
                     $B = ($B << 8) | ($B >> 24 & 0xff);
                     $K[] = $A+= $B;
                     $K[] = (($A+= $B) << 9 | $A >> 23 & 0x1ff);
@@ -488,13 +488,13 @@ 
                 list($s3, $s2, $s1, $s0) = $this->_mdsrem($le_longs[5], $le_longs[6]);
                 for ($i = 0, $j = 1; $i < 40; $i+= 2, $j+= 2) {
                     $A = $m0[$q0[$q0[$q1[$i] ^ $key[17]] ^ $key[ 9]] ^ $key[1]] ^
-                         $m1[$q0[$q1[$q1[$i] ^ $key[18]] ^ $key[10]] ^ $key[2]] ^
-                         $m2[$q1[$q0[$q0[$i] ^ $key[19]] ^ $key[11]] ^ $key[3]] ^
-                         $m3[$q1[$q1[$q0[$i] ^ $key[20]] ^ $key[12]] ^ $key[4]];
+                            $m1[$q0[$q1[$q1[$i] ^ $key[18]] ^ $key[10]] ^ $key[2]] ^
+                            $m2[$q1[$q0[$q0[$i] ^ $key[19]] ^ $key[11]] ^ $key[3]] ^
+                            $m3[$q1[$q1[$q0[$i] ^ $key[20]] ^ $key[12]] ^ $key[4]];
                     $B = $m0[$q0[$q0[$q1[$j] ^ $key[21]] ^ $key[13]] ^ $key[5]] ^
-                         $m1[$q0[$q1[$q1[$j] ^ $key[22]] ^ $key[14]] ^ $key[6]] ^
-                         $m2[$q1[$q0[$q0[$j] ^ $key[23]] ^ $key[15]] ^ $key[7]] ^
-                         $m3[$q1[$q1[$q0[$j] ^ $key[24]] ^ $key[16]] ^ $key[8]];
+                            $m1[$q0[$q1[$q1[$j] ^ $key[22]] ^ $key[14]] ^ $key[6]] ^
+                            $m2[$q1[$q0[$q0[$j] ^ $key[23]] ^ $key[15]] ^ $key[7]] ^
+                            $m3[$q1[$q1[$q0[$j] ^ $key[24]] ^ $key[16]] ^ $key[8]];
                     $B = ($B << 8) | ($B >> 24 & 0xff);
                     $K[] = $A+= $B;
                     $K[] = (($A+= $B) << 9 | $A >> 23 & 0x1ff);
@@ -513,13 +513,13 @@ 
                 list($s3, $s2, $s1, $s0) = $this->_mdsrem($le_longs[7], $le_longs[8]);
                 for ($i = 0, $j = 1; $i < 40; $i+= 2, $j+= 2) {
                     $A = $m0[$q0[$q0[$q1[$q1[$i] ^ $key[25]] ^ $key[17]] ^ $key[ 9]] ^ $key[1]] ^
-                         $m1[$q0[$q1[$q1[$q0[$i] ^ $key[26]] ^ $key[18]] ^ $key[10]] ^ $key[2]] ^
-                         $m2[$q1[$q0[$q0[$q0[$i] ^ $key[27]] ^ $key[19]] ^ $key[11]] ^ $key[3]] ^
-                         $m3[$q1[$q1[$q0[$q1[$i] ^ $key[28]] ^ $key[20]] ^ $key[12]] ^ $key[4]];
+                            $m1[$q0[$q1[$q1[$q0[$i] ^ $key[26]] ^ $key[18]] ^ $key[10]] ^ $key[2]] ^
+                            $m2[$q1[$q0[$q0[$q0[$i] ^ $key[27]] ^ $key[19]] ^ $key[11]] ^ $key[3]] ^
+                            $m3[$q1[$q1[$q0[$q1[$i] ^ $key[28]] ^ $key[20]] ^ $key[12]] ^ $key[4]];
                     $B = $m0[$q0[$q0[$q1[$q1[$j] ^ $key[29]] ^ $key[21]] ^ $key[13]] ^ $key[5]] ^
-                         $m1[$q0[$q1[$q1[$q0[$j] ^ $key[30]] ^ $key[22]] ^ $key[14]] ^ $key[6]] ^
-                         $m2[$q1[$q0[$q0[$q0[$j] ^ $key[31]] ^ $key[23]] ^ $key[15]] ^ $key[7]] ^
-                         $m3[$q1[$q1[$q0[$q1[$j] ^ $key[32]] ^ $key[24]] ^ $key[16]] ^ $key[8]];
+                            $m1[$q0[$q1[$q1[$q0[$j] ^ $key[30]] ^ $key[22]] ^ $key[14]] ^ $key[6]] ^
+                            $m2[$q1[$q0[$q0[$q0[$j] ^ $key[31]] ^ $key[23]] ^ $key[15]] ^ $key[7]] ^
+                            $m3[$q1[$q1[$q0[$q1[$j] ^ $key[32]] ^ $key[24]] ^ $key[16]] ^ $key[8]];
                     $B = ($B << 8) | ($B >> 24 & 0xff);
                     $K[] = $A+= $B;
                     $K[] = (($A+= $B) << 9 | $A >> 23 & 0x1ff);
@@ -611,25 +611,25 @@ 
         $ki = 7;
         while ($ki < 39) {
             $t0 = $S0[ $R0        & 0xff] ^
-                  $S1[($R0 >>  8) & 0xff] ^
-                  $S2[($R0 >> 16) & 0xff] ^
-                  $S3[($R0 >> 24) & 0xff];
+                    $S1[($R0 >>  8) & 0xff] ^
+                    $S2[($R0 >> 16) & 0xff] ^
+                    $S3[($R0 >> 24) & 0xff];
             $t1 = $S0[($R1 >> 24) & 0xff] ^
-                  $S1[ $R1        & 0xff] ^
-                  $S2[($R1 >>  8) & 0xff] ^
-                  $S3[($R1 >> 16) & 0xff];
+                    $S1[ $R1        & 0xff] ^
+                    $S2[($R1 >>  8) & 0xff] ^
+                    $S3[($R1 >> 16) & 0xff];
             $R2^= $t0 + $t1 + $K[++$ki];
             $R2 = ($R2 >> 1 & 0x7fffffff) | ($R2 << 31);
             $R3 = ((($R3 >> 31) & 1) | ($R3 << 1)) ^ ($t0 + ($t1 << 1) + $K[++$ki]);
 
             $t0 = $S0[ $R2        & 0xff] ^
-                  $S1[($R2 >>  8) & 0xff] ^
-                  $S2[($R2 >> 16) & 0xff] ^
-                  $S3[($R2 >> 24) & 0xff];
+                    $S1[($R2 >>  8) & 0xff] ^
+                    $S2[($R2 >> 16) & 0xff] ^
+                    $S3[($R2 >> 24) & 0xff];
             $t1 = $S0[($R3 >> 24) & 0xff] ^
-                  $S1[ $R3        & 0xff] ^
-                  $S2[($R3 >>  8) & 0xff] ^
-                  $S3[($R3 >> 16) & 0xff];
+                    $S1[ $R3        & 0xff] ^
+                    $S2[($R3 >>  8) & 0xff] ^
+                    $S3[($R3 >> 16) & 0xff];
             $R0^= ($t0 + $t1 + $K[++$ki]);
             $R0 = ($R0 >> 1 & 0x7fffffff) | ($R0 << 31);
             $R1 = ((($R1 >> 31) & 1) | ($R1 << 1)) ^ ($t0 + ($t1 << 1) + $K[++$ki]);
@@ -637,9 +637,9 @@ 
 
         // @codingStandardsIgnoreStart
         return pack("V4", $K[4] ^ $R2,
-                          $K[5] ^ $R3,
-                          $K[6] ^ $R0,
-                          $K[7] ^ $R1);
+                            $K[5] ^ $R3,
+                            $K[6] ^ $R0,
+                            $K[7] ^ $R1);
         // @codingStandardsIgnoreEnd
     }
 
@@ -667,25 +667,25 @@ 
         $ki = 40;
         while ($ki > 8) {
             $t0 = $S0[$R0       & 0xff] ^
-                  $S1[$R0 >>  8 & 0xff] ^
-                  $S2[$R0 >> 16 & 0xff] ^
-                  $S3[$R0 >> 24 & 0xff];
+                    $S1[$R0 >>  8 & 0xff] ^
+                    $S2[$R0 >> 16 & 0xff] ^
+                    $S3[$R0 >> 24 & 0xff];
             $t1 = $S0[$R1 >> 24 & 0xff] ^
-                  $S1[$R1       & 0xff] ^
-                  $S2[$R1 >>  8 & 0xff] ^
-                  $S3[$R1 >> 16 & 0xff];
+                    $S1[$R1       & 0xff] ^
+                    $S2[$R1 >>  8 & 0xff] ^
+                    $S3[$R1 >> 16 & 0xff];
             $R3^= $t0 + ($t1 << 1) + $K[--$ki];
             $R3 = $R3 >> 1 & 0x7fffffff | $R3 << 31;
             $R2 = ($R2 >> 31 & 0x1 | $R2 << 1) ^ ($t0 + $t1 + $K[--$ki]);
 
             $t0 = $S0[$R2       & 0xff] ^
-                  $S1[$R2 >>  8 & 0xff] ^
-                  $S2[$R2 >> 16 & 0xff] ^
-                  $S3[$R2 >> 24 & 0xff];
+                    $S1[$R2 >>  8 & 0xff] ^
+                    $S2[$R2 >> 16 & 0xff] ^
+                    $S3[$R2 >> 24 & 0xff];
             $t1 = $S0[$R3 >> 24 & 0xff] ^
-                  $S1[$R3       & 0xff] ^
-                  $S2[$R3 >>  8 & 0xff] ^
-                  $S3[$R3 >> 16 & 0xff];
+                    $S1[$R3       & 0xff] ^
+                    $S2[$R3 >>  8 & 0xff] ^
+                    $S3[$R3 >> 16 & 0xff];
             $R1^= $t0 + ($t1 << 1) + $K[--$ki];
             $R1 = $R1 >> 1 & 0x7fffffff | $R1 << 31;
             $R0 = ($R0 >> 31 & 0x1 | $R0 << 1) ^ ($t0 + $t1 + $K[--$ki]);
@@ -693,9 +693,9 @@ 
 
         // @codingStandardsIgnoreStart
         return pack("V4", $K[0] ^ $R2,
-                          $K[1] ^ $R3,
-                          $K[2] ^ $R0,
-                          $K[3] ^ $R1);
+                            $K[1] ^ $R3,
+                            $K[2] ^ $R0,
+                            $K[3] ^ $R1);
         // @codingStandardsIgnoreEnd
     }
 
@@ -835,11 +835,11 @@ 
 
             $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
                 array(
-                   'init_crypt'    => $init_crypt,
-                   'init_encrypt'  => '',
-                   'init_decrypt'  => '',
-                   'encrypt_block' => $encrypt_block,
-                   'decrypt_block' => $decrypt_block
+                    'init_crypt'    => $init_crypt,
+                    'init_encrypt'  => '',
+                    'init_decrypt'  => '',
+                    'encrypt_block' => $encrypt_block,
+                    'decrypt_block' => $decrypt_block
                 )
             );
         }

includes/libraries/Authentication/phpseclib/Crypt/Blowfish.php

Indentation +9 added lines, -9 removed lines

@@ -423,13 +423,13 @@ 
             $l^= $p[$i];
             $r^= ($sb_0[$l >> 24 & 0xff]  +
                   $sb_1[$l >> 16 & 0xff]  ^
-                  $sb_2[$l >>  8 & 0xff]) +
+                    $sb_2[$l >>  8 & 0xff]) +
                   $sb_3[$l       & 0xff];
 
             $r^= $p[$i + 1];
             $l^= ($sb_0[$r >> 24 & 0xff]  +
                   $sb_1[$r >> 16 & 0xff]  ^
-                  $sb_2[$r >>  8 & 0xff]) +
+                    $sb_2[$r >>  8 & 0xff]) +
                   $sb_3[$r       & 0xff];
         }
         return pack("N*", $r ^ $p[17], $l ^ $p[16]);
@@ -458,13 +458,13 @@ 
             $l^= $p[$i];
             $r^= ($sb_0[$l >> 24 & 0xff]  +
                   $sb_1[$l >> 16 & 0xff]  ^
-                  $sb_2[$l >>  8 & 0xff]) +
+                    $sb_2[$l >>  8 & 0xff]) +
                   $sb_3[$l       & 0xff];
 
             $r^= $p[$i - 1];
             $l^= ($sb_0[$r >> 24 & 0xff]  +
                   $sb_1[$r >> 16 & 0xff]  ^
-                  $sb_2[$r >>  8 & 0xff]) +
+                    $sb_2[$r >>  8 & 0xff]) +
                   $sb_3[$r       & 0xff];
         }
         return pack("N*", $r ^ $p[0], $l ^ $p[1]);
@@ -577,11 +577,11 @@ 
 
             $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
                 array(
-                   'init_crypt'    => $init_crypt,
-                   'init_encrypt'  => '',
-                   'init_decrypt'  => '',
-                   'encrypt_block' => $encrypt_block,
-                   'decrypt_block' => $decrypt_block
+                    'init_crypt'    => $init_crypt,
+                    'init_encrypt'  => '',
+                    'init_decrypt'  => '',
+                    'encrypt_block' => $encrypt_block,
+                    'decrypt_block' => $decrypt_block
                 )
             );
         }

includes/libraries/Authentication/phpseclib/Crypt/DES.php

Indentation +31 added lines, -31 removed lines

@@ -709,13 +709,13 @@ 
         $t = unpack('Nl/Nr', $block);
         list($l, $r) = array($t['l'], $t['r']);
         $block = ($shuffleip[ $r        & 0xFF] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
-                 ($shuffleip[($r >>  8) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
-                 ($shuffleip[($r >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
-                 ($shuffleip[($r >> 24) & 0xFF] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
-                 ($shuffleip[ $l        & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
-                 ($shuffleip[($l >>  8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
-                 ($shuffleip[($l >> 16) & 0xFF] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
-                 ($shuffleip[($l >> 24) & 0xFF] & "\x01\x01\x01\x01\x01\x01\x01\x01");
+                    ($shuffleip[($r >>  8) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
+                    ($shuffleip[($r >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
+                    ($shuffleip[($r >> 24) & 0xFF] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
+                    ($shuffleip[ $l        & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
+                    ($shuffleip[($l >>  8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
+                    ($shuffleip[($l >> 16) & 0xFF] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
+                    ($shuffleip[($l >> 24) & 0xFF] & "\x01\x01\x01\x01\x01\x01\x01\x01");
 
         // Extract L0 and R0.
         $t = unpack('Nl/Nr', $block);
@@ -732,9 +732,9 @@ 
 
                 // S-box indexing.
                 $t = $sbox1[($b1 >> 24) & 0x3F] ^ $sbox2[($b2 >> 24) & 0x3F] ^
-                     $sbox3[($b1 >> 16) & 0x3F] ^ $sbox4[($b2 >> 16) & 0x3F] ^
-                     $sbox5[($b1 >>  8) & 0x3F] ^ $sbox6[($b2 >>  8) & 0x3F] ^
-                     $sbox7[ $b1        & 0x3F] ^ $sbox8[ $b2        & 0x3F] ^ $l;
+                        $sbox3[($b1 >> 16) & 0x3F] ^ $sbox4[($b2 >> 16) & 0x3F] ^
+                        $sbox5[($b1 >>  8) & 0x3F] ^ $sbox6[($b2 >>  8) & 0x3F] ^
+                        $sbox7[ $b1        & 0x3F] ^ $sbox8[ $b2        & 0x3F] ^ $l;
                 // end of "the Feistel (F) function"
 
                 $l = $r;
@@ -749,13 +749,13 @@ 
 
         // Perform the inverse IP permutation.
         return ($shuffleinvip[($r >> 24) & 0xFF] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
-               ($shuffleinvip[($l >> 24) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
-               ($shuffleinvip[($r >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
-               ($shuffleinvip[($l >> 16) & 0xFF] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
-               ($shuffleinvip[($r >>  8) & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
-               ($shuffleinvip[($l >>  8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
-               ($shuffleinvip[ $r        & 0xFF] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
-               ($shuffleinvip[ $l        & 0xFF] & "\x01\x01\x01\x01\x01\x01\x01\x01");
+                ($shuffleinvip[($l >> 24) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
+                ($shuffleinvip[($r >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
+                ($shuffleinvip[($l >> 16) & 0xFF] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
+                ($shuffleinvip[($r >>  8) & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
+                ($shuffleinvip[($l >>  8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
+                ($shuffleinvip[ $r        & 0xFF] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
+                ($shuffleinvip[ $l        & 0xFF] & "\x01\x01\x01\x01\x01\x01\x01\x01");
     }
 
     /**
@@ -1230,13 +1230,13 @@ 
             $t = unpack('Nl/Nr', $key);
             list($l, $r) = array($t['l'], $t['r']);
             $key = ($this->shuffle[$pc1map[ $r        & 0xFF]] & "\x80\x80\x80\x80\x80\x80\x80\x00") |
-                   ($this->shuffle[$pc1map[($r >>  8) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x00") |
-                   ($this->shuffle[$pc1map[($r >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x00") |
-                   ($this->shuffle[$pc1map[($r >> 24) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x00") |
-                   ($this->shuffle[$pc1map[ $l        & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x00") |
-                   ($this->shuffle[$pc1map[($l >>  8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x00") |
-                   ($this->shuffle[$pc1map[($l >> 16) & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x00") |
-                   ($this->shuffle[$pc1map[($l >> 24) & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x00");
+                    ($this->shuffle[$pc1map[($r >>  8) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x00") |
+                    ($this->shuffle[$pc1map[($r >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x00") |
+                    ($this->shuffle[$pc1map[($r >> 24) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x00") |
+                    ($this->shuffle[$pc1map[ $l        & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x00") |
+                    ($this->shuffle[$pc1map[($l >>  8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x00") |
+                    ($this->shuffle[$pc1map[($l >> 16) & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x00") |
+                    ($this->shuffle[$pc1map[($l >> 24) & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x00");
             $key = unpack('Nc/Nd', $key);
             $c = ( $key['c'] >> 4) & 0x0FFFFFFF;
             $d = (($key['d'] >> 4) & 0x0FFFFFF0) | ($key['c'] & 0x0F);
@@ -1253,9 +1253,9 @@ 
 
                 // Perform the PC-2 transformation.
                 $cp = $pc2mapc1[ $c >> 24        ] | $pc2mapc2[($c >> 16) & 0xFF] |
-                      $pc2mapc3[($c >>  8) & 0xFF] | $pc2mapc4[ $c        & 0xFF];
+                        $pc2mapc3[($c >>  8) & 0xFF] | $pc2mapc4[ $c        & 0xFF];
                 $dp = $pc2mapd1[ $d >> 24        ] | $pc2mapd2[($d >> 16) & 0xFF] |
-                      $pc2mapd3[($d >>  8) & 0xFF] | $pc2mapd4[ $d        & 0xFF];
+                        $pc2mapd3[($d >>  8) & 0xFF] | $pc2mapd4[ $d        & 0xFF];
 
                 // Reorder: odd bytes/even bytes. Push the result in key schedule.
                 $val1 = ( $cp        & 0xFF000000) | (($cp <<  8) & 0x00FF0000) |
@@ -1440,11 +1440,11 @@ 
             // Creates the inline-crypt function
             $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
                 array(
-                   'init_crypt'    => $init_crypt,
-                   'init_encrypt'  => $init_encrypt,
-                   'init_decrypt'  => $init_decrypt,
-                   'encrypt_block' => $crypt_block[self::ENCRYPT],
-                   'decrypt_block' => $crypt_block[self::DECRYPT]
+                    'init_crypt'    => $init_crypt,
+                    'init_encrypt'  => $init_encrypt,
+                    'init_decrypt'  => $init_decrypt,
+                    'encrypt_block' => $crypt_block[self::ENCRYPT],
+                    'decrypt_block' => $crypt_block[self::DECRYPT]
                 )
             );
         }