Tiqr / tiqr-server-libphp

library/tiqr/Tiqr/Message/Exception.php

Indentation +4 added lines, -4 removed lines

@@ -29,8 +29,8 @@
      * @param string    $message    exception message
      * @param Exception $parent     parent exception
      */
-     public function __construct($message, $parent=null)
-     {
-         parent::__construct($message, 0, $parent);
-     }
+        public function __construct($message, $parent=null)
+        {
+            parent::__construct($message, 0, $parent);
+        }
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
      * @param string    $message    exception message
      * @param Exception $parent     parent exception
      */
-     public function __construct($message, $parent=null)
+     public function __construct($message, $parent = null)
      {
          parent::__construct($message, 0, $parent);
      }

library/tiqr/OATH/OCRAParser.php

Indentation +288 added lines, -288 removed lines

@@ -2,295 +2,295 @@
 
 class OATH_OCRAParser {
 
-	private $key = NULL;
-
-	private $OCRASuite = NULL;
-
-	private $OCRAVersion = NULL;
-
-	private $CryptoFunctionType = NULL;
-	private $CryptoFunctionHash = NULL;
-	private $CryptoFunctionHashLength = NULL;
-	private $CryptoFunctionTruncation = NULL;
-
-	private $C = FALSE;
-	private $Q = FALSE;
-	private $QType = 'N';
-	private $QLength = 8;
-
-	private $P = FALSE;
-	private $PType = 'SHA1';
-	private $PLength = 20;
-
-	private $S = FALSE;
-	private $SLength = 64;
-
-	private $T = FALSE;
-	private $TLength = 60; // 1M
-	private $TPeriods = array('H' => 3600, 'M' => 60, 'S' => 1);
-
-	private $supportedHashFunctions = array('SHA1' => 20, 'SHA256' => 32, 'SHA512' => 64);
-
-
-	public function __construct($ocraSuite) {
-		$this->parseOCRASuite($ocraSuite);
-	}
-
-	/**
-	 * Inspired by https://github.com/bdauvergne/python-oath
-	 */
-	private function parseOCRASuite($ocraSuite) {
-		if (!is_string($ocraSuite)) {
-			throw new Exception('OCRASuite not in string format: ' . var_export($ocraSuite, TRUE));
-		}
-
-		$ocraSuite = strtoupper($ocraSuite);
-		$this->OCRASuite = $ocraSuite;
-
-		$s = explode(':', $ocraSuite);
-		if (count($s) != 3) {
-			throw new Exception('Invalid OCRASuite format: ' . var_export($ocraSuite, TRUE));
-		}
-
-		$algo = explode('-', $s[0]);
-		if (count($algo) != 2) {
-			throw new Exception('Invalid OCRA version: ' . var_export($s[0], TRUE));
-		}
-
-		if ($algo[0] !== 'OCRA') {
-			throw new Exception('Unsupported OCRA algorithm: ' . var_export($algo[0], TRUE));
-		}
-
-		if ($algo[1] !== '1') {
-			throw new Exception('Unsupported OCRA version: ' . var_export($algo[1], TRUE));
-		}
-		$this->OCRAVersion = $algo[1];
-
-		$cf = explode('-', $s[1]);
-		if (count($cf) != 3) {
-			throw new Exception('Invalid OCRA suite crypto function: ' . var_export($s[1], TRUE));
-		}
-
-		if ($cf[0] !== 'HOTP') {
-			throw new Exception('Unsupported OCRA suite crypto function: ' . var_export($cf[0], TRUE));
-		}
-		$this->CryptoFunctionType = $cf[0];
-
-		if (!array_key_exists($cf[1], $this->supportedHashFunctions)) {
-			throw new Exception('Unsupported hash function in OCRA suite crypto function: ' . var_export($cf[1], TRUE));
-		}
-		$this->CryptoFunctionHash = $cf[1];
-		$this->CryptoFunctionHashLength = $this->supportedHashFunctions[$cf[1]];
-
-		if (!preg_match('/^\d+$/', $cf[2]) || (($cf[2] < 4 || $cf[2] > 10) && $cf[2] != 0)) {
-			throw new Exception('Invalid OCRA suite crypto function truncation length: ' . var_export($cf[2], TRUE));
-		}
-		$this->CryptoFunctionTruncation = intval($cf[2]);
-
-		$di = explode('-', $s[2]);
-		if (count($cf) == 0) {
-			throw new Exception('Invalid OCRA suite data input: ' . var_export($s[2], TRUE));
-		}
-
-		$data_input = array();
-		foreach($di as $elem) {
-			$letter = $elem[0];
-			if (array_key_exists($letter, $data_input)) {
-				throw new Exception('Duplicate field in OCRA suite data input: ' . var_export($elem, TRUE));
-			}
-			$data_input[$letter] = 1;
-
-			if ($letter === 'C' && strlen($elem) == 1) {
-				$this->C = TRUE;
-			} elseif ($letter === 'Q') {
-				if (strlen($elem) == 1) {
-					$this->Q = TRUE;
-				} elseif (preg_match('/^Q([AHN])(\d+)$/', $elem, $match)) {
-					$q_len = intval($match[2]);
-					if ($q_len < 4 || $q_len > 64) {
-						throw new Exception('Invalid OCRA suite data input question length: ' . var_export($q_len, TRUE));
-					}
-					$this->Q = TRUE;
-					$this->QType = $match[1];
-					$this->QLength = $q_len;
-				} else {
-					throw new Exception('Invalid OCRA suite data input question: ' . var_export($elem, TRUE));
-				}
-			} elseif ($letter === 'P') {
-				if (strlen($elem) == 1) {
-					$this->P = TRUE;
-				} else {
-					$p_algo = substr($elem, 1);
-					if (!array_key_exists($p_algo, $this->supportedHashFunctions)) {
-						throw new Exception('Unsupported OCRA suite PIN hash function: ' . var_export($elem, TRUE));
-					}
-					$this->P = TRUE;
-					$this->PType = $p_algo;
-					$this->PLength = $this->supportedHashFunctions[$p_algo];
-				}
-			} elseif ($letter === 'S') {
-				if (strlen($elem) == 1) {
-					$this->S = TRUE;
-				} elseif (preg_match('/^S(\d+)$/', $elem, $match)) {
-					$s_len = intval($match[1]);
-					if ($s_len <= 0 || $s_len > 512) {
-						throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($s_len, TRUE));
-					}
-
-					$this->S = TRUE;
-					$this->SLength = $s_len;
-				} else {
-					throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($elem, TRUE));
-				}
-			} elseif ($letter === 'T') {
-				if (strlen($elem) == 1) {
-					$this->T = TRUE;
-				} elseif (preg_match('/^T(\d+[HMS])+$/', $elem)) {
-					preg_match_all('/(\d+)([HMS])/', $elem, $match);
-
-					if (count($match[1]) !== count(array_unique($match[2]))) {
-						throw new Exception('Duplicate definitions in OCRA suite data input timestamp: ' . var_export($elem, TRUE));
-					}
-
-					$length = 0;
-					for ($i = 0; $i < count($match[1]); $i++) {
-						$length += intval($match[1][$i]) * $this->TPeriods[$match[2][$i]];
-					}
-					if ($length <= 0) {
-						throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE));
-					}
-
-					$this->T = TRUE;
-					$this->TLength = $length;
-				} else {
-					throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE));
-				}
-			} else {
-				throw new Exception('Unsupported OCRA suite data input field: ' . var_export($elem, TRUE));
-			}
-		}
-
-		if (!$this->Q) {
-			throw new Exception('OCRA suite data input question not defined: ' . var_export($s[2], TRUE));
-		}
-	}
-
-	public function generateChallenge() {
-		$q_length = $this->QLength;
-		$q_type = $this->QType;
-
-		$bytes = self::generateRandomBytes($q_length);
-
-		switch($q_type) {
-			case 'A':
-				$challenge = base64_encode($bytes);
-				$tr = implode("", unpack('H*', $bytes));
-				$challenge = rtrim(strtr($challenge, '+/', $tr), '=');
-				break;
-			case 'H':
-				$challenge = implode("", unpack('H*', $bytes));
-				break;
-			case 'N':
-				$challenge = implode("", unpack('N*', $bytes));
-				break;
-			default:
-				throw new Exception('Unsupported OCRASuite challenge type: ' . var_export($q_type, TRUE));
-				break;
-		}
-
-		$challenge = substr($challenge, 0, $q_length);
-
-		return $challenge;
-	}
-
-
-	public function generateSessionInformation() {
-		if (!$this->S) {
-			throw new Exception('Session information not defined in OCRASuite: ' . var_export($this->OCRASuite, TRUE));
-		}
-
-		$s_length = $this->SLength;
-		$bytes = self::generateRandomBytes($s_length);
-
-		// The OCRA spec doesn't specify that the session data should be hexadecimal.
-		// However the reference implementation in the RFC does treat it as hex.
-		$session = bin2hex($bytes);
+    private $key = NULL;
+
+    private $OCRASuite = NULL;
+
+    private $OCRAVersion = NULL;
+
+    private $CryptoFunctionType = NULL;
+    private $CryptoFunctionHash = NULL;
+    private $CryptoFunctionHashLength = NULL;
+    private $CryptoFunctionTruncation = NULL;
+
+    private $C = FALSE;
+    private $Q = FALSE;
+    private $QType = 'N';
+    private $QLength = 8;
+
+    private $P = FALSE;
+    private $PType = 'SHA1';
+    private $PLength = 20;
+
+    private $S = FALSE;
+    private $SLength = 64;
+
+    private $T = FALSE;
+    private $TLength = 60; // 1M
+    private $TPeriods = array('H' => 3600, 'M' => 60, 'S' => 1);
+
+    private $supportedHashFunctions = array('SHA1' => 20, 'SHA256' => 32, 'SHA512' => 64);
+
+
+    public function __construct($ocraSuite) {
+        $this->parseOCRASuite($ocraSuite);
+    }
+
+    /**
+     * Inspired by https://github.com/bdauvergne/python-oath
+     */
+    private function parseOCRASuite($ocraSuite) {
+        if (!is_string($ocraSuite)) {
+            throw new Exception('OCRASuite not in string format: ' . var_export($ocraSuite, TRUE));
+        }
+
+        $ocraSuite = strtoupper($ocraSuite);
+        $this->OCRASuite = $ocraSuite;
+
+        $s = explode(':', $ocraSuite);
+        if (count($s) != 3) {
+            throw new Exception('Invalid OCRASuite format: ' . var_export($ocraSuite, TRUE));
+        }
+
+        $algo = explode('-', $s[0]);
+        if (count($algo) != 2) {
+            throw new Exception('Invalid OCRA version: ' . var_export($s[0], TRUE));
+        }
+
+        if ($algo[0] !== 'OCRA') {
+            throw new Exception('Unsupported OCRA algorithm: ' . var_export($algo[0], TRUE));
+        }
+
+        if ($algo[1] !== '1') {
+            throw new Exception('Unsupported OCRA version: ' . var_export($algo[1], TRUE));
+        }
+        $this->OCRAVersion = $algo[1];
+
+        $cf = explode('-', $s[1]);
+        if (count($cf) != 3) {
+            throw new Exception('Invalid OCRA suite crypto function: ' . var_export($s[1], TRUE));
+        }
+
+        if ($cf[0] !== 'HOTP') {
+            throw new Exception('Unsupported OCRA suite crypto function: ' . var_export($cf[0], TRUE));
+        }
+        $this->CryptoFunctionType = $cf[0];
+
+        if (!array_key_exists($cf[1], $this->supportedHashFunctions)) {
+            throw new Exception('Unsupported hash function in OCRA suite crypto function: ' . var_export($cf[1], TRUE));
+        }
+        $this->CryptoFunctionHash = $cf[1];
+        $this->CryptoFunctionHashLength = $this->supportedHashFunctions[$cf[1]];
+
+        if (!preg_match('/^\d+$/', $cf[2]) || (($cf[2] < 4 || $cf[2] > 10) && $cf[2] != 0)) {
+            throw new Exception('Invalid OCRA suite crypto function truncation length: ' . var_export($cf[2], TRUE));
+        }
+        $this->CryptoFunctionTruncation = intval($cf[2]);
+
+        $di = explode('-', $s[2]);
+        if (count($cf) == 0) {
+            throw new Exception('Invalid OCRA suite data input: ' . var_export($s[2], TRUE));
+        }
+
+        $data_input = array();
+        foreach($di as $elem) {
+            $letter = $elem[0];
+            if (array_key_exists($letter, $data_input)) {
+                throw new Exception('Duplicate field in OCRA suite data input: ' . var_export($elem, TRUE));
+            }
+            $data_input[$letter] = 1;
+
+            if ($letter === 'C' && strlen($elem) == 1) {
+                $this->C = TRUE;
+            } elseif ($letter === 'Q') {
+                if (strlen($elem) == 1) {
+                    $this->Q = TRUE;
+                } elseif (preg_match('/^Q([AHN])(\d+)$/', $elem, $match)) {
+                    $q_len = intval($match[2]);
+                    if ($q_len < 4 || $q_len > 64) {
+                        throw new Exception('Invalid OCRA suite data input question length: ' . var_export($q_len, TRUE));
+                    }
+                    $this->Q = TRUE;
+                    $this->QType = $match[1];
+                    $this->QLength = $q_len;
+                } else {
+                    throw new Exception('Invalid OCRA suite data input question: ' . var_export($elem, TRUE));
+                }
+            } elseif ($letter === 'P') {
+                if (strlen($elem) == 1) {
+                    $this->P = TRUE;
+                } else {
+                    $p_algo = substr($elem, 1);
+                    if (!array_key_exists($p_algo, $this->supportedHashFunctions)) {
+                        throw new Exception('Unsupported OCRA suite PIN hash function: ' . var_export($elem, TRUE));
+                    }
+                    $this->P = TRUE;
+                    $this->PType = $p_algo;
+                    $this->PLength = $this->supportedHashFunctions[$p_algo];
+                }
+            } elseif ($letter === 'S') {
+                if (strlen($elem) == 1) {
+                    $this->S = TRUE;
+                } elseif (preg_match('/^S(\d+)$/', $elem, $match)) {
+                    $s_len = intval($match[1]);
+                    if ($s_len <= 0 || $s_len > 512) {
+                        throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($s_len, TRUE));
+                    }
+
+                    $this->S = TRUE;
+                    $this->SLength = $s_len;
+                } else {
+                    throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($elem, TRUE));
+                }
+            } elseif ($letter === 'T') {
+                if (strlen($elem) == 1) {
+                    $this->T = TRUE;
+                } elseif (preg_match('/^T(\d+[HMS])+$/', $elem)) {
+                    preg_match_all('/(\d+)([HMS])/', $elem, $match);
+
+                    if (count($match[1]) !== count(array_unique($match[2]))) {
+                        throw new Exception('Duplicate definitions in OCRA suite data input timestamp: ' . var_export($elem, TRUE));
+                    }
+
+                    $length = 0;
+                    for ($i = 0; $i < count($match[1]); $i++) {
+                        $length += intval($match[1][$i]) * $this->TPeriods[$match[2][$i]];
+                    }
+                    if ($length <= 0) {
+                        throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE));
+                    }
+
+                    $this->T = TRUE;
+                    $this->TLength = $length;
+                } else {
+                    throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE));
+                }
+            } else {
+                throw new Exception('Unsupported OCRA suite data input field: ' . var_export($elem, TRUE));
+            }
+        }
+
+        if (!$this->Q) {
+            throw new Exception('OCRA suite data input question not defined: ' . var_export($s[2], TRUE));
+        }
+    }
+
+    public function generateChallenge() {
+        $q_length = $this->QLength;
+        $q_type = $this->QType;
+
+        $bytes = self::generateRandomBytes($q_length);
+
+        switch($q_type) {
+            case 'A':
+                $challenge = base64_encode($bytes);
+                $tr = implode("", unpack('H*', $bytes));
+                $challenge = rtrim(strtr($challenge, '+/', $tr), '=');
+                break;
+            case 'H':
+                $challenge = implode("", unpack('H*', $bytes));
+                break;
+            case 'N':
+                $challenge = implode("", unpack('N*', $bytes));
+                break;
+            default:
+                throw new Exception('Unsupported OCRASuite challenge type: ' . var_export($q_type, TRUE));
+                break;
+        }
+
+        $challenge = substr($challenge, 0, $q_length);
+
+        return $challenge;
+    }
+
+
+    public function generateSessionInformation() {
+        if (!$this->S) {
+            throw new Exception('Session information not defined in OCRASuite: ' . var_export($this->OCRASuite, TRUE));
+        }
+
+        $s_length = $this->SLength;
+        $bytes = self::generateRandomBytes($s_length);
+
+        // The OCRA spec doesn't specify that the session data should be hexadecimal.
+        // However the reference implementation in the RFC does treat it as hex.
+        $session = bin2hex($bytes);
 		
-		$session = substr($session, 0, $s_length);
+        $session = substr($session, 0, $s_length);
 		
-		return $session;
-	}
-
-	/**
-	 * Borrowed from SimpleSAMLPHP http://simplesamlphp.org/
-	 */
-	public static function generateRandomBytesMTrand($length) {
-
-		/* Use mt_rand to generate $length random bytes. */
-		$data = '';
-		for($i = 0; $i < $length; $i++) {
-			$data .= chr(mt_rand(0, 255));
-		}
-
-		return $data;
-	}
-
-
-	/**
-	 * Borrowed from SimpleSAMLPHP http://simplesamlphp.org/
-	 */
-	public static function generateRandomBytes($length, $fallback = TRUE) {
-		static $fp = NULL;
-
-		if (function_exists('openssl_random_pseudo_bytes')) {
-			return openssl_random_pseudo_bytes($length);
-		}
-
-		if($fp === NULL) {
-			if (@file_exists('/dev/urandom')) {
-				$fp = @fopen('/dev/urandom', 'rb');
-			} else {
-				$fp = FALSE;
-			}
-		}
-
-		if($fp !== FALSE) {
-			/* Read random bytes from /dev/urandom. */
-			$data = fread($fp, $length);
-			if($data === FALSE) {
-				throw new Exception('Error reading random data.');
-			}
-			if(strlen($data) != $length) {
-				if ($fallback) {
-					$data = self::generateRandomBytesMTrand($length);
-				} else {
-					throw new Exception('Did not get requested number of bytes from random source. Requested (' . $length . ') got (' . strlen($data) . ')');
-				}
-			}
-		} else {
-			/* Use mt_rand to generate $length random bytes. */
-			$data = self::generateRandomBytesMTrand($length);
-		}
-
-		return $data;
-	}
-
-
-	/**
-	 * Constant time string comparison, see http://codahale.com/a-lesson-in-timing-attacks/
-	 */
-	public static function constEqual($s1, $s2) {
-		if (strlen($s1) != strlen($s2)) {
-			return FALSE;
-		}
-
-		$result = TRUE;
-		$length = strlen($s1);
-		for ($i = 0; $i < $length; $i++) {
-			$result &= ($s1[$i] == $s2[$i]);
-		}
-
-		return (boolean)$result;
-	}
+        return $session;
+    }
+
+    /**
+     * Borrowed from SimpleSAMLPHP http://simplesamlphp.org/
+     */
+    public static function generateRandomBytesMTrand($length) {
+
+        /* Use mt_rand to generate $length random bytes. */
+        $data = '';
+        for($i = 0; $i < $length; $i++) {
+            $data .= chr(mt_rand(0, 255));
+        }
+
+        return $data;
+    }
+
+
+    /**
+     * Borrowed from SimpleSAMLPHP http://simplesamlphp.org/
+     */
+    public static function generateRandomBytes($length, $fallback = TRUE) {
+        static $fp = NULL;
+
+        if (function_exists('openssl_random_pseudo_bytes')) {
+            return openssl_random_pseudo_bytes($length);
+        }
+
+        if($fp === NULL) {
+            if (@file_exists('/dev/urandom')) {
+                $fp = @fopen('/dev/urandom', 'rb');
+            } else {
+                $fp = FALSE;
+            }
+        }
+
+        if($fp !== FALSE) {
+            /* Read random bytes from /dev/urandom. */
+            $data = fread($fp, $length);
+            if($data === FALSE) {
+                throw new Exception('Error reading random data.');
+            }
+            if(strlen($data) != $length) {
+                if ($fallback) {
+                    $data = self::generateRandomBytesMTrand($length);
+                } else {
+                    throw new Exception('Did not get requested number of bytes from random source. Requested (' . $length . ') got (' . strlen($data) . ')');
+                }
+            }
+        } else {
+            /* Use mt_rand to generate $length random bytes. */
+            $data = self::generateRandomBytesMTrand($length);
+        }
+
+        return $data;
+    }
+
+
+    /**
+     * Constant time string comparison, see http://codahale.com/a-lesson-in-timing-attacks/
+     */
+    public static function constEqual($s1, $s2) {
+        if (strlen($s1) != strlen($s2)) {
+            return FALSE;
+        }
+
+        $result = TRUE;
+        $length = strlen($s1);
+        for ($i = 0; $i < $length; $i++) {
+            $result &= ($s1[$i] == $s2[$i]);
+        }
+
+        return (boolean)$result;
+    }
 
 }

Spacing +32 added lines, -32 removed lines

@@ -41,7 +41,7 @@ 
 	 */
 	private function parseOCRASuite($ocraSuite) {
 		if (!is_string($ocraSuite)) {
-			throw new Exception('OCRASuite not in string format: ' . var_export($ocraSuite, TRUE));
+			throw new Exception('OCRASuite not in string format: '.var_export($ocraSuite, TRUE));
 		}
 
 		$ocraSuite = strtoupper($ocraSuite);
@@ -49,54 +49,54 @@ 
 
 		$s = explode(':', $ocraSuite);
 		if (count($s) != 3) {
-			throw new Exception('Invalid OCRASuite format: ' . var_export($ocraSuite, TRUE));
+			throw new Exception('Invalid OCRASuite format: '.var_export($ocraSuite, TRUE));
 		}
 
 		$algo = explode('-', $s[0]);
 		if (count($algo) != 2) {
-			throw new Exception('Invalid OCRA version: ' . var_export($s[0], TRUE));
+			throw new Exception('Invalid OCRA version: '.var_export($s[0], TRUE));
 		}
 
 		if ($algo[0] !== 'OCRA') {
-			throw new Exception('Unsupported OCRA algorithm: ' . var_export($algo[0], TRUE));
+			throw new Exception('Unsupported OCRA algorithm: '.var_export($algo[0], TRUE));
 		}
 
 		if ($algo[1] !== '1') {
-			throw new Exception('Unsupported OCRA version: ' . var_export($algo[1], TRUE));
+			throw new Exception('Unsupported OCRA version: '.var_export($algo[1], TRUE));
 		}
 		$this->OCRAVersion = $algo[1];
 
 		$cf = explode('-', $s[1]);
 		if (count($cf) != 3) {
-			throw new Exception('Invalid OCRA suite crypto function: ' . var_export($s[1], TRUE));
+			throw new Exception('Invalid OCRA suite crypto function: '.var_export($s[1], TRUE));
 		}
 
 		if ($cf[0] !== 'HOTP') {
-			throw new Exception('Unsupported OCRA suite crypto function: ' . var_export($cf[0], TRUE));
+			throw new Exception('Unsupported OCRA suite crypto function: '.var_export($cf[0], TRUE));
 		}
 		$this->CryptoFunctionType = $cf[0];
 
 		if (!array_key_exists($cf[1], $this->supportedHashFunctions)) {
-			throw new Exception('Unsupported hash function in OCRA suite crypto function: ' . var_export($cf[1], TRUE));
+			throw new Exception('Unsupported hash function in OCRA suite crypto function: '.var_export($cf[1], TRUE));
 		}
 		$this->CryptoFunctionHash = $cf[1];
 		$this->CryptoFunctionHashLength = $this->supportedHashFunctions[$cf[1]];
 
 		if (!preg_match('/^\d+$/', $cf[2]) || (($cf[2] < 4 || $cf[2] > 10) && $cf[2] != 0)) {
-			throw new Exception('Invalid OCRA suite crypto function truncation length: ' . var_export($cf[2], TRUE));
+			throw new Exception('Invalid OCRA suite crypto function truncation length: '.var_export($cf[2], TRUE));
 		}
 		$this->CryptoFunctionTruncation = intval($cf[2]);
 
 		$di = explode('-', $s[2]);
 		if (count($cf) == 0) {
-			throw new Exception('Invalid OCRA suite data input: ' . var_export($s[2], TRUE));
+			throw new Exception('Invalid OCRA suite data input: '.var_export($s[2], TRUE));
 		}
 
 		$data_input = array();
-		foreach($di as $elem) {
+		foreach ($di as $elem) {
 			$letter = $elem[0];
 			if (array_key_exists($letter, $data_input)) {
-				throw new Exception('Duplicate field in OCRA suite data input: ' . var_export($elem, TRUE));
+				throw new Exception('Duplicate field in OCRA suite data input: '.var_export($elem, TRUE));
 			}
 			$data_input[$letter] = 1;
 
@@ -108,13 +108,13 @@ 
 				} elseif (preg_match('/^Q([AHN])(\d+)$/', $elem, $match)) {
 					$q_len = intval($match[2]);
 					if ($q_len < 4 || $q_len > 64) {
-						throw new Exception('Invalid OCRA suite data input question length: ' . var_export($q_len, TRUE));
+						throw new Exception('Invalid OCRA suite data input question length: '.var_export($q_len, TRUE));
 					}
 					$this->Q = TRUE;
 					$this->QType = $match[1];
 					$this->QLength = $q_len;
 				} else {
-					throw new Exception('Invalid OCRA suite data input question: ' . var_export($elem, TRUE));
+					throw new Exception('Invalid OCRA suite data input question: '.var_export($elem, TRUE));
 				}
 			} elseif ($letter === 'P') {
 				if (strlen($elem) == 1) {
@@ -122,7 +122,7 @@ 
 				} else {
 					$p_algo = substr($elem, 1);
 					if (!array_key_exists($p_algo, $this->supportedHashFunctions)) {
-						throw new Exception('Unsupported OCRA suite PIN hash function: ' . var_export($elem, TRUE));
+						throw new Exception('Unsupported OCRA suite PIN hash function: '.var_export($elem, TRUE));
 					}
 					$this->P = TRUE;
 					$this->PType = $p_algo;
@@ -134,13 +134,13 @@ 
 				} elseif (preg_match('/^S(\d+)$/', $elem, $match)) {
 					$s_len = intval($match[1]);
 					if ($s_len <= 0 || $s_len > 512) {
-						throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($s_len, TRUE));
+						throw new Exception('Invalid OCRA suite data input session information length: '.var_export($s_len, TRUE));
 					}
 
 					$this->S = TRUE;
 					$this->SLength = $s_len;
 				} else {
-					throw new Exception('Invalid OCRA suite data input session information length: ' . var_export($elem, TRUE));
+					throw new Exception('Invalid OCRA suite data input session information length: '.var_export($elem, TRUE));
 				}
 			} elseif ($letter === 'T') {
 				if (strlen($elem) == 1) {
@@ -149,7 +149,7 @@ 
 					preg_match_all('/(\d+)([HMS])/', $elem, $match);
 
 					if (count($match[1]) !== count(array_unique($match[2]))) {
-						throw new Exception('Duplicate definitions in OCRA suite data input timestamp: ' . var_export($elem, TRUE));
+						throw new Exception('Duplicate definitions in OCRA suite data input timestamp: '.var_export($elem, TRUE));
 					}
 
 					$length = 0;
@@ -157,21 +157,21 @@ 
 						$length += intval($match[1][$i]) * $this->TPeriods[$match[2][$i]];
 					}
 					if ($length <= 0) {
-						throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE));
+						throw new Exception('Invalid OCRA suite data input timestamp: '.var_export($elem, TRUE));
 					}
 
 					$this->T = TRUE;
 					$this->TLength = $length;
 				} else {
-					throw new Exception('Invalid OCRA suite data input timestamp: ' . var_export($elem, TRUE));
+					throw new Exception('Invalid OCRA suite data input timestamp: '.var_export($elem, TRUE));
 				}
 			} else {
-				throw new Exception('Unsupported OCRA suite data input field: ' . var_export($elem, TRUE));
+				throw new Exception('Unsupported OCRA suite data input field: '.var_export($elem, TRUE));
 			}
 		}
 
 		if (!$this->Q) {
-			throw new Exception('OCRA suite data input question not defined: ' . var_export($s[2], TRUE));
+			throw new Exception('OCRA suite data input question not defined: '.var_export($s[2], TRUE));
 		}
 	}
 
@@ -181,7 +181,7 @@ 
 
 		$bytes = self::generateRandomBytes($q_length);
 
-		switch($q_type) {
+		switch ($q_type) {
 			case 'A':
 				$challenge = base64_encode($bytes);
 				$tr = implode("", unpack('H*', $bytes));
@@ -194,7 +194,7 @@ 
 				$challenge = implode("", unpack('N*', $bytes));
 				break;
 			default:
-				throw new Exception('Unsupported OCRASuite challenge type: ' . var_export($q_type, TRUE));
+				throw new Exception('Unsupported OCRASuite challenge type: '.var_export($q_type, TRUE));
 				break;
 		}
 
@@ -206,7 +206,7 @@ 
 
 	public function generateSessionInformation() {
 		if (!$this->S) {
-			throw new Exception('Session information not defined in OCRASuite: ' . var_export($this->OCRASuite, TRUE));
+			throw new Exception('Session information not defined in OCRASuite: '.var_export($this->OCRASuite, TRUE));
 		}
 
 		$s_length = $this->SLength;
@@ -228,7 +228,7 @@ 
 
 		/* Use mt_rand to generate $length random bytes. */
 		$data = '';
-		for($i = 0; $i < $length; $i++) {
+		for ($i = 0; $i < $length; $i++) {
 			$data .= chr(mt_rand(0, 255));
 		}
 
@@ -246,7 +246,7 @@ 
 			return openssl_random_pseudo_bytes($length);
 		}
 
-		if($fp === NULL) {
+		if ($fp === NULL) {
 			if (@file_exists('/dev/urandom')) {
 				$fp = @fopen('/dev/urandom', 'rb');
 			} else {
@@ -254,17 +254,17 @@ 
 			}
 		}
 
-		if($fp !== FALSE) {
+		if ($fp !== FALSE) {
 			/* Read random bytes from /dev/urandom. */
 			$data = fread($fp, $length);
-			if($data === FALSE) {
+			if ($data === FALSE) {
 				throw new Exception('Error reading random data.');
 			}
-			if(strlen($data) != $length) {
+			if (strlen($data) != $length) {
 				if ($fallback) {
 					$data = self::generateRandomBytesMTrand($length);
 				} else {
-					throw new Exception('Did not get requested number of bytes from random source. Requested (' . $length . ') got (' . strlen($data) . ')');
+					throw new Exception('Did not get requested number of bytes from random source. Requested ('.$length.') got ('.strlen($data).')');
 				}
 			}
 		} else {
@@ -290,7 +290,7 @@ 
 			$result &= ($s1[$i] == $s2[$i]);
 		}
 
-		return (boolean)$result;
+		return (boolean) $result;
 	}
 
 }

library/tiqr/OATH/OCRATest.php

Indentation +115 added lines, -115 removed lines

@@ -4,127 +4,127 @@
 
 class OATH_OCRATest extends PHPUnit_Framework_TestCase {
 
-	/**
-	 * @dataProvider RFCVectorsProvider
-	 */
-	public function testRFCVectors($ocrasuite, $key, $datainput, $expected_result) {
-		$ocra = new OATH_OCRA($ocrasuite, $key, NULL, $datainput['Q']);
-		$ocra->setKey($key, 'hexstring');
-		$ocra->setQuestion($datainput['Q']);
-		if (isset($datainput['C'])) {
-			$ocra->setCounter($datainput['C']);
-		}
-		if (isset($datainput['P'])) {
-			$ocra->setPin($datainput['P']);
-		} elseif (isset($datainput['P:hexdigest'])) {
-			$ocra->setPin($datainput['P:hexdigest'], 'hexdigest');
-		}
-		if (isset($datainput['T'])) {
-			$ocra->setTimestamp($datainput['T']);
-		}
-		$this->assertTrue($ocra->verifyResponse($expected_result));
-	}
+    /**
+     * @dataProvider RFCVectorsProvider
+     */
+    public function testRFCVectors($ocrasuite, $key, $datainput, $expected_result) {
+        $ocra = new OATH_OCRA($ocrasuite, $key, NULL, $datainput['Q']);
+        $ocra->setKey($key, 'hexstring');
+        $ocra->setQuestion($datainput['Q']);
+        if (isset($datainput['C'])) {
+            $ocra->setCounter($datainput['C']);
+        }
+        if (isset($datainput['P'])) {
+            $ocra->setPin($datainput['P']);
+        } elseif (isset($datainput['P:hexdigest'])) {
+            $ocra->setPin($datainput['P:hexdigest'], 'hexdigest');
+        }
+        if (isset($datainput['T'])) {
+            $ocra->setTimestamp($datainput['T']);
+        }
+        $this->assertTrue($ocra->verifyResponse($expected_result));
+    }
 
 
-	public function RFCVectorsProvider() {
-		$pin = '1234';
-		$pin_sha1 = '7110eda4d09e062aa5e4a390b0a572ac0d2c0220';
+    public function RFCVectorsProvider() {
+        $pin = '1234';
+        $pin_sha1 = '7110eda4d09e062aa5e4a390b0a572ac0d2c0220';
 
-		$key20 = '3132333435363738393031323334353637383930';
-		$key32 = '3132333435363738393031323334353637383930313233343536373839303132';
-		$key64 = '31323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334';
+        $key20 = '3132333435363738393031323334353637383930';
+        $key32 = '3132333435363738393031323334353637383930313233343536373839303132';
+        $key64 = '31323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334';
 
-		$tests = array(
-			array(
-				'ocrasuite' => 'OCRA-1:HOTP-SHA1-6:QN08',
-				'key' => $key20,
-				'vectors' => array(
-					array('params' => array( 'Q' => '00000000' ), 'result' => '237653' ),
-					array('params' => array( 'Q' => '11111111' ), 'result' => '243178' ),
-					array('params' => array( 'Q' => '22222222' ), 'result' => '653583' ),
-					array('params' => array( 'Q' => '33333333' ), 'result' => '740991' ),
-					array('params' => array( 'Q' => '44444444' ), 'result' => '608993' ),
-					array('params' => array( 'Q' => '55555555' ), 'result' => '388898' ),
-					array('params' => array( 'Q' => '66666666' ), 'result' => '816933' ),
-					array('params' => array( 'Q' => '77777777' ), 'result' => '224598' ),
-					array('params' => array( 'Q' => '88888888' ), 'result' => '750600' ),
-					array('params' => array( 'Q' => '99999999' ), 'result' => '294470' ),
-				)
-			),
-			array(
-				'ocrasuite' => 'OCRA-1:HOTP-SHA256-8:C-QN08-PSHA1',
-				'key' => $key32,
-				'pin_sha1' => $pin_sha1,
-				'vectors' => array(
-					array('params' => array( 'C' => 0, 'Q' => '12345678' ), 'result' => '65347737' ),
-					array('params' => array( 'C' => 1, 'Q' => '12345678' ), 'result' => '86775851' ),
-					array('params' => array( 'C' => 2, 'Q' => '12345678' ), 'result' => '78192410' ),
-					array('params' => array( 'C' => 3, 'Q' => '12345678' ), 'result' => '71565254' ),
-					array('params' => array( 'C' => 4, 'Q' => '12345678' ), 'result' => '10104329' ),
-					array('params' => array( 'C' => 5, 'Q' => '12345678' ), 'result' => '65983500' ),
-					array('params' => array( 'C' => 6, 'Q' => '12345678' ), 'result' => '70069104' ),
-					array('params' => array( 'C' => 7, 'Q' => '12345678' ), 'result' => '91771096' ),
-					array('params' => array( 'C' => 8, 'Q' => '12345678' ), 'result' => '75011558' ),
-					array('params' => array( 'C' => 9, 'Q' => '12345678' ), 'result' => '08522129' ),
-				)
-			),
-			array(
-				'ocrasuite' => 'OCRA-1:HOTP-SHA256-8:QN08-PSHA1',
-				'key' => $key32,
-				'pin_sha1' => $pin_sha1,
-				'vectors' => array(
-					array('params' => array( 'Q' => '00000000' ), 'result' => '83238735' ),
-					array('params' => array( 'Q' => '11111111' ), 'result' => '01501458' ),
-					array('params' => array( 'Q' => '22222222' ), 'result' => '17957585' ),
-					array('params' => array( 'Q' => '33333333' ), 'result' => '86776967' ),
-					array('params' => array( 'Q' => '44444444' ), 'result' => '86807031' ),
-				)
-			),
-			array(
-				'ocrasuite' => 'OCRA-1:HOTP-SHA512-8:C-QN08',
-				'key' => $key64,
-				'vectors' => array(
-					array('params' => array( 'C' => '00000', 'Q' => '00000000' ), 'result' => '07016083' ),
-					array('params' => array( 'C' => '00001', 'Q' => '11111111' ), 'result' => '63947962' ),
-					array('params' => array( 'C' => '00002', 'Q' => '22222222' ), 'result' => '70123924' ),
-					array('params' => array( 'C' => '00003', 'Q' => '33333333' ), 'result' => '25341727' ),
-					array('params' => array( 'C' => '00004', 'Q' => '44444444' ), 'result' => '33203315' ),
-					array('params' => array( 'C' => '00005', 'Q' => '55555555' ), 'result' => '34205738' ),
-					array('params' => array( 'C' => '00006', 'Q' => '66666666' ), 'result' => '44343969' ),
-					array('params' => array( 'C' => '00007', 'Q' => '77777777' ), 'result' => '51946085' ),
-					array('params' => array( 'C' => '00008', 'Q' => '88888888' ), 'result' => '20403879' ),
-					array('params' => array( 'C' => '00009', 'Q' => '99999999' ), 'result' => '31409299' ),
-				)
-			),
-			array(
-				'ocrasuite' => 'OCRA-1:HOTP-SHA512-8:QN08-T1M',
-				'key' => $key64,
-				'vectors' => array(
-					array('params' => array( 'Q' => '00000000', 'T' => intval('132d0b6', 16) ), 'result' => '95209754' ),
-					array('params' => array( 'Q' => '11111111', 'T' => intval('132d0b6', 16) ), 'result' => '55907591' ),
-					array('params' => array( 'Q' => '22222222', 'T' => intval('132d0b6', 16) ), 'result' => '22048402' ),
-					array('params' => array( 'Q' => '33333333', 'T' => intval('132d0b6', 16) ), 'result' => '24218844' ),
-					array('params' => array( 'Q' => '44444444', 'T' => intval('132d0b6', 16) ), 'result' => '36209546' ),
-				)
-			),
-		);
+        $tests = array(
+            array(
+                'ocrasuite' => 'OCRA-1:HOTP-SHA1-6:QN08',
+                'key' => $key20,
+                'vectors' => array(
+                    array('params' => array( 'Q' => '00000000' ), 'result' => '237653' ),
+                    array('params' => array( 'Q' => '11111111' ), 'result' => '243178' ),
+                    array('params' => array( 'Q' => '22222222' ), 'result' => '653583' ),
+                    array('params' => array( 'Q' => '33333333' ), 'result' => '740991' ),
+                    array('params' => array( 'Q' => '44444444' ), 'result' => '608993' ),
+                    array('params' => array( 'Q' => '55555555' ), 'result' => '388898' ),
+                    array('params' => array( 'Q' => '66666666' ), 'result' => '816933' ),
+                    array('params' => array( 'Q' => '77777777' ), 'result' => '224598' ),
+                    array('params' => array( 'Q' => '88888888' ), 'result' => '750600' ),
+                    array('params' => array( 'Q' => '99999999' ), 'result' => '294470' ),
+                )
+            ),
+            array(
+                'ocrasuite' => 'OCRA-1:HOTP-SHA256-8:C-QN08-PSHA1',
+                'key' => $key32,
+                'pin_sha1' => $pin_sha1,
+                'vectors' => array(
+                    array('params' => array( 'C' => 0, 'Q' => '12345678' ), 'result' => '65347737' ),
+                    array('params' => array( 'C' => 1, 'Q' => '12345678' ), 'result' => '86775851' ),
+                    array('params' => array( 'C' => 2, 'Q' => '12345678' ), 'result' => '78192410' ),
+                    array('params' => array( 'C' => 3, 'Q' => '12345678' ), 'result' => '71565254' ),
+                    array('params' => array( 'C' => 4, 'Q' => '12345678' ), 'result' => '10104329' ),
+                    array('params' => array( 'C' => 5, 'Q' => '12345678' ), 'result' => '65983500' ),
+                    array('params' => array( 'C' => 6, 'Q' => '12345678' ), 'result' => '70069104' ),
+                    array('params' => array( 'C' => 7, 'Q' => '12345678' ), 'result' => '91771096' ),
+                    array('params' => array( 'C' => 8, 'Q' => '12345678' ), 'result' => '75011558' ),
+                    array('params' => array( 'C' => 9, 'Q' => '12345678' ), 'result' => '08522129' ),
+                )
+            ),
+            array(
+                'ocrasuite' => 'OCRA-1:HOTP-SHA256-8:QN08-PSHA1',
+                'key' => $key32,
+                'pin_sha1' => $pin_sha1,
+                'vectors' => array(
+                    array('params' => array( 'Q' => '00000000' ), 'result' => '83238735' ),
+                    array('params' => array( 'Q' => '11111111' ), 'result' => '01501458' ),
+                    array('params' => array( 'Q' => '22222222' ), 'result' => '17957585' ),
+                    array('params' => array( 'Q' => '33333333' ), 'result' => '86776967' ),
+                    array('params' => array( 'Q' => '44444444' ), 'result' => '86807031' ),
+                )
+            ),
+            array(
+                'ocrasuite' => 'OCRA-1:HOTP-SHA512-8:C-QN08',
+                'key' => $key64,
+                'vectors' => array(
+                    array('params' => array( 'C' => '00000', 'Q' => '00000000' ), 'result' => '07016083' ),
+                    array('params' => array( 'C' => '00001', 'Q' => '11111111' ), 'result' => '63947962' ),
+                    array('params' => array( 'C' => '00002', 'Q' => '22222222' ), 'result' => '70123924' ),
+                    array('params' => array( 'C' => '00003', 'Q' => '33333333' ), 'result' => '25341727' ),
+                    array('params' => array( 'C' => '00004', 'Q' => '44444444' ), 'result' => '33203315' ),
+                    array('params' => array( 'C' => '00005', 'Q' => '55555555' ), 'result' => '34205738' ),
+                    array('params' => array( 'C' => '00006', 'Q' => '66666666' ), 'result' => '44343969' ),
+                    array('params' => array( 'C' => '00007', 'Q' => '77777777' ), 'result' => '51946085' ),
+                    array('params' => array( 'C' => '00008', 'Q' => '88888888' ), 'result' => '20403879' ),
+                    array('params' => array( 'C' => '00009', 'Q' => '99999999' ), 'result' => '31409299' ),
+                )
+            ),
+            array(
+                'ocrasuite' => 'OCRA-1:HOTP-SHA512-8:QN08-T1M',
+                'key' => $key64,
+                'vectors' => array(
+                    array('params' => array( 'Q' => '00000000', 'T' => intval('132d0b6', 16) ), 'result' => '95209754' ),
+                    array('params' => array( 'Q' => '11111111', 'T' => intval('132d0b6', 16) ), 'result' => '55907591' ),
+                    array('params' => array( 'Q' => '22222222', 'T' => intval('132d0b6', 16) ), 'result' => '22048402' ),
+                    array('params' => array( 'Q' => '33333333', 'T' => intval('132d0b6', 16) ), 'result' => '24218844' ),
+                    array('params' => array( 'Q' => '44444444', 'T' => intval('132d0b6', 16) ), 'result' => '36209546' ),
+                )
+            ),
+        );
 
-		$data = array();
+        $data = array();
 
-		foreach($tests as $test) {
-			$ocrasuite = $test['ocrasuite'];
-			foreach($test['vectors'] as $vector) {
-				$datainput = $vector['params'];
-				if (isset($test['pin'])) {
-					$datainput['P'] = $test['pin'];
-				} elseif (isset($test['pin_sha1'])) {
-					$datainput['P:hexdigest'] = $test['pin_sha1'];
-				}
-				$data[] = array($ocrasuite, $test['key'], $datainput, $vector['result']);
-			}
-		}
+        foreach($tests as $test) {
+            $ocrasuite = $test['ocrasuite'];
+            foreach($test['vectors'] as $vector) {
+                $datainput = $vector['params'];
+                if (isset($test['pin'])) {
+                    $datainput['P'] = $test['pin'];
+                } elseif (isset($test['pin_sha1'])) {
+                    $datainput['P:hexdigest'] = $test['pin_sha1'];
+                }
+                $data[] = array($ocrasuite, $test['key'], $datainput, $vector['result']);
+            }
+        }
 
-		return $data;
-	}
+        return $data;
+    }
 
 }

Spacing +43 added lines, -43 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-require_once(realpath(dirname(__FILE__) . '/OCRA.php'));
+require_once(realpath(dirname(__FILE__).'/OCRA.php'));
 
 class OATH_OCRATest extends PHPUnit_Framework_TestCase {
 
@@ -39,16 +39,16 @@ 
 				'ocrasuite' => 'OCRA-1:HOTP-SHA1-6:QN08',
 				'key' => $key20,
 				'vectors' => array(
-					array('params' => array( 'Q' => '00000000' ), 'result' => '237653' ),
-					array('params' => array( 'Q' => '11111111' ), 'result' => '243178' ),
-					array('params' => array( 'Q' => '22222222' ), 'result' => '653583' ),
-					array('params' => array( 'Q' => '33333333' ), 'result' => '740991' ),
-					array('params' => array( 'Q' => '44444444' ), 'result' => '608993' ),
-					array('params' => array( 'Q' => '55555555' ), 'result' => '388898' ),
-					array('params' => array( 'Q' => '66666666' ), 'result' => '816933' ),
-					array('params' => array( 'Q' => '77777777' ), 'result' => '224598' ),
-					array('params' => array( 'Q' => '88888888' ), 'result' => '750600' ),
-					array('params' => array( 'Q' => '99999999' ), 'result' => '294470' ),
+					array('params' => array('Q' => '00000000'), 'result' => '237653'),
+					array('params' => array('Q' => '11111111'), 'result' => '243178'),
+					array('params' => array('Q' => '22222222'), 'result' => '653583'),
+					array('params' => array('Q' => '33333333'), 'result' => '740991'),
+					array('params' => array('Q' => '44444444'), 'result' => '608993'),
+					array('params' => array('Q' => '55555555'), 'result' => '388898'),
+					array('params' => array('Q' => '66666666'), 'result' => '816933'),
+					array('params' => array('Q' => '77777777'), 'result' => '224598'),
+					array('params' => array('Q' => '88888888'), 'result' => '750600'),
+					array('params' => array('Q' => '99999999'), 'result' => '294470'),
 				)
 			),
 			array(
@@ -56,16 +56,16 @@ 
 				'key' => $key32,
 				'pin_sha1' => $pin_sha1,
 				'vectors' => array(
-					array('params' => array( 'C' => 0, 'Q' => '12345678' ), 'result' => '65347737' ),
-					array('params' => array( 'C' => 1, 'Q' => '12345678' ), 'result' => '86775851' ),
-					array('params' => array( 'C' => 2, 'Q' => '12345678' ), 'result' => '78192410' ),
-					array('params' => array( 'C' => 3, 'Q' => '12345678' ), 'result' => '71565254' ),
-					array('params' => array( 'C' => 4, 'Q' => '12345678' ), 'result' => '10104329' ),
-					array('params' => array( 'C' => 5, 'Q' => '12345678' ), 'result' => '65983500' ),
-					array('params' => array( 'C' => 6, 'Q' => '12345678' ), 'result' => '70069104' ),
-					array('params' => array( 'C' => 7, 'Q' => '12345678' ), 'result' => '91771096' ),
-					array('params' => array( 'C' => 8, 'Q' => '12345678' ), 'result' => '75011558' ),
-					array('params' => array( 'C' => 9, 'Q' => '12345678' ), 'result' => '08522129' ),
+					array('params' => array('C' => 0, 'Q' => '12345678'), 'result' => '65347737'),
+					array('params' => array('C' => 1, 'Q' => '12345678'), 'result' => '86775851'),
+					array('params' => array('C' => 2, 'Q' => '12345678'), 'result' => '78192410'),
+					array('params' => array('C' => 3, 'Q' => '12345678'), 'result' => '71565254'),
+					array('params' => array('C' => 4, 'Q' => '12345678'), 'result' => '10104329'),
+					array('params' => array('C' => 5, 'Q' => '12345678'), 'result' => '65983500'),
+					array('params' => array('C' => 6, 'Q' => '12345678'), 'result' => '70069104'),
+					array('params' => array('C' => 7, 'Q' => '12345678'), 'result' => '91771096'),
+					array('params' => array('C' => 8, 'Q' => '12345678'), 'result' => '75011558'),
+					array('params' => array('C' => 9, 'Q' => '12345678'), 'result' => '08522129'),
 				)
 			),
 			array(
@@ -73,47 +73,47 @@ 
 				'key' => $key32,
 				'pin_sha1' => $pin_sha1,
 				'vectors' => array(
-					array('params' => array( 'Q' => '00000000' ), 'result' => '83238735' ),
-					array('params' => array( 'Q' => '11111111' ), 'result' => '01501458' ),
-					array('params' => array( 'Q' => '22222222' ), 'result' => '17957585' ),
-					array('params' => array( 'Q' => '33333333' ), 'result' => '86776967' ),
-					array('params' => array( 'Q' => '44444444' ), 'result' => '86807031' ),
+					array('params' => array('Q' => '00000000'), 'result' => '83238735'),
+					array('params' => array('Q' => '11111111'), 'result' => '01501458'),
+					array('params' => array('Q' => '22222222'), 'result' => '17957585'),
+					array('params' => array('Q' => '33333333'), 'result' => '86776967'),
+					array('params' => array('Q' => '44444444'), 'result' => '86807031'),
 				)
 			),
 			array(
 				'ocrasuite' => 'OCRA-1:HOTP-SHA512-8:C-QN08',
 				'key' => $key64,
 				'vectors' => array(
-					array('params' => array( 'C' => '00000', 'Q' => '00000000' ), 'result' => '07016083' ),
-					array('params' => array( 'C' => '00001', 'Q' => '11111111' ), 'result' => '63947962' ),
-					array('params' => array( 'C' => '00002', 'Q' => '22222222' ), 'result' => '70123924' ),
-					array('params' => array( 'C' => '00003', 'Q' => '33333333' ), 'result' => '25341727' ),
-					array('params' => array( 'C' => '00004', 'Q' => '44444444' ), 'result' => '33203315' ),
-					array('params' => array( 'C' => '00005', 'Q' => '55555555' ), 'result' => '34205738' ),
-					array('params' => array( 'C' => '00006', 'Q' => '66666666' ), 'result' => '44343969' ),
-					array('params' => array( 'C' => '00007', 'Q' => '77777777' ), 'result' => '51946085' ),
-					array('params' => array( 'C' => '00008', 'Q' => '88888888' ), 'result' => '20403879' ),
-					array('params' => array( 'C' => '00009', 'Q' => '99999999' ), 'result' => '31409299' ),
+					array('params' => array('C' => '00000', 'Q' => '00000000'), 'result' => '07016083'),
+					array('params' => array('C' => '00001', 'Q' => '11111111'), 'result' => '63947962'),
+					array('params' => array('C' => '00002', 'Q' => '22222222'), 'result' => '70123924'),
+					array('params' => array('C' => '00003', 'Q' => '33333333'), 'result' => '25341727'),
+					array('params' => array('C' => '00004', 'Q' => '44444444'), 'result' => '33203315'),
+					array('params' => array('C' => '00005', 'Q' => '55555555'), 'result' => '34205738'),
+					array('params' => array('C' => '00006', 'Q' => '66666666'), 'result' => '44343969'),
+					array('params' => array('C' => '00007', 'Q' => '77777777'), 'result' => '51946085'),
+					array('params' => array('C' => '00008', 'Q' => '88888888'), 'result' => '20403879'),
+					array('params' => array('C' => '00009', 'Q' => '99999999'), 'result' => '31409299'),
 				)
 			),
 			array(
 				'ocrasuite' => 'OCRA-1:HOTP-SHA512-8:QN08-T1M',
 				'key' => $key64,
 				'vectors' => array(
-					array('params' => array( 'Q' => '00000000', 'T' => intval('132d0b6', 16) ), 'result' => '95209754' ),
-					array('params' => array( 'Q' => '11111111', 'T' => intval('132d0b6', 16) ), 'result' => '55907591' ),
-					array('params' => array( 'Q' => '22222222', 'T' => intval('132d0b6', 16) ), 'result' => '22048402' ),
-					array('params' => array( 'Q' => '33333333', 'T' => intval('132d0b6', 16) ), 'result' => '24218844' ),
-					array('params' => array( 'Q' => '44444444', 'T' => intval('132d0b6', 16) ), 'result' => '36209546' ),
+					array('params' => array('Q' => '00000000', 'T' => intval('132d0b6', 16)), 'result' => '95209754'),
+					array('params' => array('Q' => '11111111', 'T' => intval('132d0b6', 16)), 'result' => '55907591'),
+					array('params' => array('Q' => '22222222', 'T' => intval('132d0b6', 16)), 'result' => '22048402'),
+					array('params' => array('Q' => '33333333', 'T' => intval('132d0b6', 16)), 'result' => '24218844'),
+					array('params' => array('Q' => '44444444', 'T' => intval('132d0b6', 16)), 'result' => '36209546'),
 				)
 			),
 		);
 
 		$data = array();
 
-		foreach($tests as $test) {
+		foreach ($tests as $test) {
 			$ocrasuite = $test['ocrasuite'];
-			foreach($test['vectors'] as $vector) {
+			foreach ($test['vectors'] as $vector) {
 				$datainput = $vector['params'];
 				if (isset($test['pin'])) {
 					$datainput['P'] = $test['pin'];

library/tiqr/Tiqr/UserStorage/Encryption/Dummy.php

Indentation +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
     }
     
     /**
-      * Decrypts the given data.
+     * Decrypts the given data.
      *
      * @param String $data Data to decrypt.
      *

library/tiqr/Tiqr/Message/Exception/SendFailure.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
      * @param boolean   $temporary  temporary failure?
      * @param Exception $parent     parent exception
      */
-    public function __construct($message, $temporary=false, Exception $parent=null)
+    public function __construct($message, $temporary = false, Exception $parent = null)
     {
         parent::__construct($message, $parent);
         $this->_temporary = $temporary;

library/tiqr/Tiqr/Message/FCM.php

Indentation +3 added lines, -3 removed lines

@@ -97,9 +97,9 @@
 
         // Wait and retry once in case of a 502 Bad Gateway error
         if ($statusCode === 502 && !($retry)) {
-          sleep(2);
-          $this->_sendFirebase($deviceToken, $alert, $challenge, $apiKey, true);
-          return;
+            sleep(2);
+            $this->_sendFirebase($deviceToken, $alert, $challenge, $apiKey, true);
+            return;
         }
 
         if ($statusCode !== 200) {

Spacing +5 added lines, -5 removed lines

@@ -57,7 +57,7 @@ 
      *
      * @throws Tiqr_Message_Exception_SendFailure
      */
-    private function _sendFirebase($deviceToken, $alert, $challenge, $apiKey, $retry=false)
+    private function _sendFirebase($deviceToken, $alert, $challenge, $apiKey, $retry = false)
     {
         $msg = array(
             'challenge' => $challenge,
@@ -71,7 +71,7 @@ 
         );
 
         $headers = array(
-            'Authorization: key=' . $apiKey,
+            'Authorization: key='.$apiKey,
             'Content-Type: application/json',
         );
 
@@ -84,7 +84,7 @@ 
         $result = curl_exec($ch);
         $errors = curl_error($ch);
         $statusCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        $remoteip = curl_getinfo($ch,CURLINFO_PRIMARY_IP);
+        $remoteip = curl_getinfo($ch, CURLINFO_PRIMARY_IP);
         curl_close($ch);
 
         if ($result === false) {
@@ -92,7 +92,7 @@ 
         }
 
         if (!empty($errors)) {
-            throw new Tiqr_Message_Exception_SendFailure("Http error occurred: ". $errors, true);
+            throw new Tiqr_Message_Exception_SendFailure("Http error occurred: ".$errors, true);
         }
 
         // Wait and retry once in case of a 502 Bad Gateway error
@@ -110,7 +110,7 @@ 
         $response = json_decode($result, true);
         foreach ($response['results'] as $k => $v) {
             if (isset($v['error'])) {
-                throw new Tiqr_Message_Exception_SendFailure("Error in GCM response: " . $v['error'], true);
+                throw new Tiqr_Message_Exception_SendFailure("Error in GCM response: ".$v['error'], true);
             }
         }
     }