Tiqr / tiqr-server-libphp

library/tiqr/OATH/OCRAParser.php

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

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'];