Tiqr / tiqr-server-libphp

library/tiqr/Tiqr/OATH/OCRAWrapper_v1.php

Spacing +6 added lines, -6 removed lines

@@ -107,19 +107,19 @@ 
     {
         // find the :QN10, -QN10, QH10 etc. bit
         $pos = stripos($ocraSuite, ":q");
-        if ($pos===false) $pos = stripos($ocraSuite, "-q");
-        if ($pos===false) {
+        if ($pos === false) $pos = stripos($ocraSuite, "-q");
+        if ($pos === false) {
             // No challenge config specified. Since we only support challenge based OCRA, we fallback to default 10 digit hexadecimal.
             return array("format"=>"H", "length"=>10);
         }
-        $format = substr($ocraSuite, $pos+2, 1);
+        $format = substr($ocraSuite, $pos + 2, 1);
         if (!in_array($format, array("N", "A", "H"))) {
             $format = "H";
         }
         
-        $length = (int)substr($ocraSuite, $pos+3, 2);
+        $length = (int) substr($ocraSuite, $pos + 3, 2);
                 
-        if ($length<=0) {
+        if ($length <= 0) {
             $length = 10;
         }
         
@@ -190,7 +190,7 @@ 
      */
     protected function _calculateResponse($ocraSuite, $secret, $challenge, $sessionKey)
     {       
-        if (strpos(strtolower($ocraSuite), "qn")!==false) {
+        if (strpos(strtolower($ocraSuite), "qn") !== false) {
             
             // challenge is decimal, but generateOcra always wants it in hex.
             $challenge = dechex($challenge);

library/tiqr/Tiqr/OATH/HOTP.php

Spacing +14 added lines, -14 removed lines

@@ -46,25 +46,25 @@ 
      * @param String $counter
      * @return String hash
      */
-    protected function _getHash ($secret, $counter)
+    protected function _getHash($secret, $counter)
     {
          // Counter
          //the counter value can be more than one byte long, so we need to go multiple times
-         $cur_counter = array(0,0,0,0,0,0,0,0);
-         for($i=7;$i>=0;$i--)
+         $cur_counter = array(0, 0, 0, 0, 0, 0, 0, 0);
+         for ($i = 7; $i >= 0; $i--)
          {
-             $cur_counter[$i] = pack ('C*', $counter);
+             $cur_counter[$i] = pack('C*', $counter);
              $counter = $counter >> 8;
          }
          $bin_counter = implode($cur_counter);
          // Pad to 8 chars
-         if (strlen ($bin_counter) < 8)
+         if (strlen($bin_counter) < 8)
          {
-             $bin_counter = str_repeat (chr(0), 8 - strlen ($bin_counter)) . $bin_counter;
+             $bin_counter = str_repeat(chr(0), 8 - strlen($bin_counter)).$bin_counter;
          }
      
          // HMAC
-         $hash = hash_hmac ('sha1', $bin_counter, $secret);
+         $hash = hash_hmac('sha1', $bin_counter, $secret);
          return $hash;
     }
  
@@ -77,9 +77,9 @@ 
     protected function _truncate($hash, $length = 6)
     {
          // Convert to dec
-         foreach(str_split($hash,2) as $hex)
+         foreach (str_split($hash, 2) as $hex)
          {
-             $hmac_result[]=hexdec($hex);
+             $hmac_result[] = hexdec($hex);
          }
      
          // Find offset
@@ -88,10 +88,10 @@ 
          // Algorithm from RFC
          return
          (
-             (($hmac_result[$offset+0] & 0x7f) << 24 ) |
-             (($hmac_result[$offset+1] & 0xff) << 16 ) |
-             (($hmac_result[$offset+2] & 0xff) << 8 ) |
-             ($hmac_result[$offset+3] & 0xff)
-         ) % pow(10,$length);
+             (($hmac_result[$offset + 0] & 0x7f) << 24) |
+             (($hmac_result[$offset + 1] & 0xff) << 16) |
+             (($hmac_result[$offset + 2] & 0xff) << 8) |
+             ($hmac_result[$offset + 3] & 0xff)
+         ) % pow(10, $length);
     }
 }

library/tiqr/Tiqr/OATH/OCRA_v1.php

Spacing +49 added lines, -49 removed lines

@@ -46,7 +46,7 @@ 
             $keyBytes,
             $text)
     {
-         $hash = hash_hmac ($crypto, $text, $keyBytes);
+         $hash = hash_hmac($crypto, $text, $keyBytes);
          return $hash;
     }
 
@@ -57,7 +57,7 @@ 
      *
      * @return String a string with raw bytes
      */
-    private static function _hexStr2Bytes($hex){
+    private static function _hexStr2Bytes($hex) {
         return pack("H*", $hex);
     }
 
@@ -101,63 +101,63 @@ 
         $sessionInformationLength = 0;
         $timeStampLength = 0;
 
-        if(stripos($ocraSuite, "sha1")!==false)
+        if (stripos($ocraSuite, "sha1") !== false)
             $crypto = "sha1";
-        if(stripos($ocraSuite, "sha256")!==false)
+        if (stripos($ocraSuite, "sha256") !== false)
             $crypto = "sha256";
-        if(stripos($ocraSuite, "sha512")!==false)
+        if (stripos($ocraSuite, "sha512") !== false)
             $crypto = "sha512";
 
         // How many digits should we return
-        $oS = substr($ocraSuite, strpos($ocraSuite, ":")+1, strpos($ocraSuite, ":", strpos($ocraSuite, ":")+1) -strpos($ocraSuite, ":")-1);
-        $codeDigits = substr($oS, strrpos($oS, "-")+1);
+        $oS = substr($ocraSuite, strpos($ocraSuite, ":") + 1, strpos($ocraSuite, ":", strpos($ocraSuite, ":") + 1) - strpos($ocraSuite, ":") - 1);
+        $codeDigits = substr($oS, strrpos($oS, "-") + 1);
         
         // The size of the byte array message to be encrypted
         // Counter
-        if(stripos($ocraSuite, ":c") !==false) {
+        if (stripos($ocraSuite, ":c") !== false) {
             // Fix the length of the HEX string
-            while(strlen($counter) < 16)
-                $counter = "0" . $counter;
-            $counterLength=8;
+            while (strlen($counter) < 16)
+                $counter = "0".$counter;
+            $counterLength = 8;
         }
         // Question
-        if(stripos($ocraSuite, ":q")!==false ||
-                stripos($ocraSuite, "-q")!==false) {
-            while(strlen($question) < 256)
-                $question = $question . "0";
-            $questionLength=128;
+        if (stripos($ocraSuite, ":q") !== false ||
+                stripos($ocraSuite, "-q") !== false) {
+            while (strlen($question) < 256)
+                $question = $question."0";
+            $questionLength = 128;
         }
 
         // Password
-        if(stripos($ocraSuite, ":p")!==false ||
-                stripos($ocraSuite, "-p") !==false) {
-            while(strlen($password) < 40)
-                $password = "0" . $password;
-            $passwordLength=20;
+        if (stripos($ocraSuite, ":p") !== false ||
+                stripos($ocraSuite, "-p") !== false) {
+            while (strlen($password) < 40)
+                $password = "0".$password;
+            $passwordLength = 20;
         }
 
         // sessionInformation
-        if(stripos($ocraSuite, ":s") !==false ||
-                stripos($ocraSuite, "-s", strpos($ocraSuite, ":", strpos($ocraSuite, ":")+1)) !== false) {
-            while(strlen($sessionInformation) < 128)
-                $sessionInformation = "0" . $sessionInformation;
+        if (stripos($ocraSuite, ":s") !== false ||
+                stripos($ocraSuite, "-s", strpos($ocraSuite, ":", strpos($ocraSuite, ":") + 1)) !== false) {
+            while (strlen($sessionInformation) < 128)
+                $sessionInformation = "0".$sessionInformation;
 
-            $sessionInformationLength=64;
+            $sessionInformationLength = 64;
         }
              
         // TimeStamp
-        if(stripos($ocraSuite, ":t") !==false ||
+        if (stripos($ocraSuite, ":t") !== false ||
                 stripos($ocraSuite, "-t") !== false) {
-            while(strlen($timeStamp) < 16)
-                $timeStamp = "0" . $timeStamp;
-            $timeStampLength=8;
+            while (strlen($timeStamp) < 16)
+                $timeStamp = "0".$timeStamp;
+            $timeStampLength = 8;
         }
 
         // Put the bytes of "ocraSuite" parameters into the message
         
-        $msg = array_fill(0,$ocraSuiteLength+$counterLength+$questionLength+$passwordLength+$sessionInformationLength+$timeStampLength+1, 0);
+        $msg = array_fill(0, $ocraSuiteLength + $counterLength + $questionLength + $passwordLength + $sessionInformationLength + $timeStampLength + 1, 0);
                 
-        for($i=0;$i<strlen($ocraSuite);$i++) {
+        for ($i = 0; $i < strlen($ocraSuite); $i++) {
             $msg[$i] = $ocraSuite[$i];
         }
         
@@ -166,9 +166,9 @@ 
 
         // Put the bytes of "Counter" to the message
         // Input is HEX encoded
-        if($counterLength > 0 ) {
+        if ($counterLength > 0) {
             $bArray = self::_hexStr2Bytes($counter);
-            for ($i=0;$i<strlen($bArray);$i++) {
+            for ($i = 0; $i < strlen($bArray); $i++) {
                 $msg [$i + $ocraSuiteLength + 1] = $bArray[$i];
             }
         }
@@ -176,36 +176,36 @@ 
 
         // Put the bytes of "question" to the message
         // Input is text encoded
-        if($questionLength > 0 ) {
+        if ($questionLength > 0) {
             $bArray = self::_hexStr2Bytes($question);
-            for ($i=0;$i<strlen($bArray);$i++) {
+            for ($i = 0; $i < strlen($bArray); $i++) {
                 $msg [$i + $ocraSuiteLength + 1 + $counterLength] = $bArray[$i];
             }
         }
 
         // Put the bytes of "password" to the message
         // Input is HEX encoded
-        if($passwordLength > 0){
+        if ($passwordLength > 0) {
             $bArray = self::_hexStr2Bytes($password);
-            for ($i=0;$i<strlen($bArray);$i++) {
+            for ($i = 0; $i < strlen($bArray); $i++) {
                 $msg [$i + $ocraSuiteLength + 1 + $counterLength + $questionLength] = $bArray[$i];
             }
         }
 
         // Put the bytes of "sessionInformation" to the message
         // Input is text encoded
-        if($sessionInformationLength > 0 ){
+        if ($sessionInformationLength > 0) {
             $bArray = self::_hexStr2Bytes($sessionInformation);
-            for ($i=0;$i<strlen($bArray);$i++) {
+            for ($i = 0; $i < strlen($bArray); $i++) {
                 $msg [$i + $ocraSuiteLength + 1 + $counterLength + $questionLength + $passwordLength] = $bArray[$i];
             }
         }
 
         // Put the bytes of "time" to the message
         // Input is text value of minutes
-        if($timeStampLength > 0){
+        if ($timeStampLength > 0) {
             $bArray = self::_hexStr2Bytes($timestamp);
-            for ($i=0;$i<strlen($bArray);$i++) {
+            for ($i = 0; $i < strlen($bArray); $i++) {
                 $msg [$i + $ocraSuiteLength + 1 + $counterLength + $questionLength + $passwordLength + $sessionInformationLength] = $bArray[$i];
             }
         }
@@ -227,9 +227,9 @@ 
     function _oath_truncate($hash, $length = 6)
     {
         // Convert to dec
-        foreach(str_split($hash,2) as $hex)
+        foreach (str_split($hash, 2) as $hex)
         {
-            $hmac_result[]=hexdec($hex);
+            $hmac_result[] = hexdec($hex);
         }
     
         // Find offset
@@ -238,11 +238,11 @@ 
         // Algorithm from RFC
         return
         (
-            (($hmac_result[$offset+0] & 0x7f) << 24 ) |
-            (($hmac_result[$offset+1] & 0xff) << 16 ) |
-            (($hmac_result[$offset+2] & 0xff) << 8 ) |
-            ($hmac_result[$offset+3] & 0xff)
-        ) % pow(10,$length);
+            (($hmac_result[$offset + 0] & 0x7f) << 24) |
+            (($hmac_result[$offset + 1] & 0xff) << 16) |
+            (($hmac_result[$offset + 2] & 0xff) << 8) |
+            ($hmac_result[$offset + 3] & 0xff)
+        ) % pow(10, $length);
     }
     
 }

library/tiqr/Tiqr/OATH/OCRA.php

Spacing +69 added lines, -69 removed lines

@@ -37,7 +37,7 @@ 
             $keyBytes,
             $text)
     {
-         $hash = hash_hmac ($crypto, $text, $keyBytes);
+         $hash = hash_hmac($crypto, $text, $keyBytes);
          return $hash;
     }
 
@@ -48,7 +48,7 @@ 
      *
      * @return String a string with raw bytes
      */
-    private static function _hexStr2Bytes($hex){
+    private static function _hexStr2Bytes($hex) {
         return pack("H*", $hex);
     }
 
@@ -97,95 +97,95 @@ 
         $cryptoFunction = $components[1];
         $dataInput = strtolower($components[2]); // lower here so we can do case insensitive comparisons
         
-        if(stripos($cryptoFunction, "sha1")!==false)
+        if (stripos($cryptoFunction, "sha1") !== false)
             $crypto = "sha1";
-        if(stripos($cryptoFunction, "sha256")!==false)
+        if (stripos($cryptoFunction, "sha256") !== false)
             $crypto = "sha256";
-        if(stripos($cryptoFunction, "sha512")!==false)
+        if (stripos($cryptoFunction, "sha512") !== false)
             $crypto = "sha512";
         
-        $codeDigits = substr($cryptoFunction, strrpos($cryptoFunction, "-")+1);
+        $codeDigits = substr($cryptoFunction, strrpos($cryptoFunction, "-") + 1);
                 
         // The size of the byte array message to be encrypted
         // Counter
-        if($dataInput[0] == "c" ) {
+        if ($dataInput[0] == "c") {
             // Fix the length of the HEX string
-            while(strlen($counter) < 16)
-                $counter = "0" . $counter;
-            $counterLength=8;
+            while (strlen($counter) < 16)
+                $counter = "0".$counter;
+            $counterLength = 8;
         }
         // Question
-        if($dataInput[0] == "q" ||
-                stripos($dataInput, "-q")!==false) {
-            while(strlen($question) < 256)
-                $question = $question . "0";
-            $questionLength=128;
+        if ($dataInput[0] == "q" ||
+                stripos($dataInput, "-q") !== false) {
+            while (strlen($question) < 256)
+                $question = $question."0";
+            $questionLength = 128;
         }
 
         // Password
-        if(stripos($dataInput, "psha1")!==false) {
-            while(strlen($password) < 40)
-                $password = "0" . $password;
-            $passwordLength=20;
+        if (stripos($dataInput, "psha1") !== false) {
+            while (strlen($password) < 40)
+                $password = "0".$password;
+            $passwordLength = 20;
         }
     
-        if(stripos($dataInput, "psha256")!==false) {
-            while(strlen($password) < 64)
-                $password = "0" . $password;
-            $passwordLength=32;
+        if (stripos($dataInput, "psha256") !== false) {
+            while (strlen($password) < 64)
+                $password = "0".$password;
+            $passwordLength = 32;
         }
         
-        if(stripos($dataInput, "psha512")!==false) {
-            while(strlen($password) < 128)
-                $password = "0" . $password;
-            $passwordLength=64;
+        if (stripos($dataInput, "psha512") !== false) {
+            while (strlen($password) < 128)
+                $password = "0".$password;
+            $passwordLength = 64;
         }
         
         // sessionInformation
-        if(stripos($dataInput, "s064") !==false) {
-            while(strlen($sessionInformation) < 128)
-                $sessionInformation = "0" . $sessionInformation;
+        if (stripos($dataInput, "s064") !== false) {
+            while (strlen($sessionInformation) < 128)
+                $sessionInformation = "0".$sessionInformation;
 
-            $sessionInformationLength=64;
-        } else if(stripos($dataInput, "s128") !==false) {
-            while(strlen($sessionInformation) < 256)
-                $sessionInformation = "0" . $sessionInformation;
+            $sessionInformationLength = 64;
+        } else if (stripos($dataInput, "s128") !== false) {
+            while (strlen($sessionInformation) < 256)
+                $sessionInformation = "0".$sessionInformation;
         
-            $sessionInformationLength=128;
-        } else if(stripos($dataInput, "s256") !==false) {
-            while(strlen($sessionInformation) < 512)
-                $sessionInformation = "0" . $sessionInformation;
+            $sessionInformationLength = 128;
+        } else if (stripos($dataInput, "s256") !== false) {
+            while (strlen($sessionInformation) < 512)
+                $sessionInformation = "0".$sessionInformation;
         
-            $sessionInformationLength=256;
-        } else if(stripos($dataInput, "s512") !==false) {
-            while(strlen($sessionInformation) < 128)
-                $sessionInformation = "0" . $sessionInformation;
+            $sessionInformationLength = 256;
+        } else if (stripos($dataInput, "s512") !== false) {
+            while (strlen($sessionInformation) < 128)
+                $sessionInformation = "0".$sessionInformation;
         
-            $sessionInformationLength=64;
-        } else if (stripos($dataInput, "s") !== false ) {
+            $sessionInformationLength = 64;
+        } else if (stripos($dataInput, "s") !== false) {
             // deviation from spec. Officially 's' without a length indicator is not in the reference implementation.
             // RFC is ambigious. However we have supported this in Tiqr since day 1, so we continue to support it.
-            while(strlen($sessionInformation) < 128)
-                $sessionInformation = "0" . $sessionInformation;
+            while (strlen($sessionInformation) < 128)
+                $sessionInformation = "0".$sessionInformation;
             
-            $sessionInformationLength=64;
+            $sessionInformationLength = 64;
         }
         
         
              
         // TimeStamp
-        if($dataInput[0] == "t" ||
+        if ($dataInput[0] == "t" ||
                 stripos($dataInput, "-t") !== false) {
-            while(strlen($timeStamp) < 16)
-                $timeStamp = "0" . $timeStamp;
-            $timeStampLength=8;
+            while (strlen($timeStamp) < 16)
+                $timeStamp = "0".$timeStamp;
+            $timeStampLength = 8;
         }
 
         // Put the bytes of "ocraSuite" parameters into the message
         
-        $msg = array_fill(0,$ocraSuiteLength+$counterLength+$questionLength+$passwordLength+$sessionInformationLength+$timeStampLength+1, 0);
+        $msg = array_fill(0, $ocraSuiteLength + $counterLength + $questionLength + $passwordLength + $sessionInformationLength + $timeStampLength + 1, 0);
                 
-        for($i=0;$i<strlen($ocraSuite);$i++) {
+        for ($i = 0; $i < strlen($ocraSuite); $i++) {
             $msg[$i] = $ocraSuite[$i];
         }
         
@@ -194,9 +194,9 @@ 
 
         // Put the bytes of "Counter" to the message
         // Input is HEX encoded
-        if($counterLength > 0 ) {
+        if ($counterLength > 0) {
             $bArray = self::_hexStr2Bytes($counter);
-            for ($i=0;$i<strlen($bArray);$i++) {
+            for ($i = 0; $i < strlen($bArray); $i++) {
                 $msg [$i + $ocraSuiteLength + 1] = $bArray[$i];
             }
         }
@@ -204,36 +204,36 @@ 
 
         // Put the bytes of "question" to the message
         // Input is text encoded
-        if($questionLength > 0 ) {
+        if ($questionLength > 0) {
             $bArray = self::_hexStr2Bytes($question);
-            for ($i=0;$i<strlen($bArray);$i++) {
+            for ($i = 0; $i < strlen($bArray); $i++) {
                 $msg [$i + $ocraSuiteLength + 1 + $counterLength] = $bArray[$i];
             }
         }
 
         // Put the bytes of "password" to the message
         // Input is HEX encoded
-        if($passwordLength > 0){
+        if ($passwordLength > 0) {
             $bArray = self::_hexStr2Bytes($password);
-            for ($i=0;$i<strlen($bArray);$i++) {
+            for ($i = 0; $i < strlen($bArray); $i++) {
                 $msg [$i + $ocraSuiteLength + 1 + $counterLength + $questionLength] = $bArray[$i];
             }
         }
 
         // Put the bytes of "sessionInformation" to the message
         // Input is text encoded
-        if($sessionInformationLength > 0 ){
+        if ($sessionInformationLength > 0) {
             $bArray = self::_hexStr2Bytes($sessionInformation);
-            for ($i=0;$i<strlen($bArray);$i++) {
+            for ($i = 0; $i < strlen($bArray); $i++) {
                 $msg [$i + $ocraSuiteLength + 1 + $counterLength + $questionLength + $passwordLength] = $bArray[$i];
             }
         }
 
         // Put the bytes of "time" to the message
         // Input is text value of minutes
-        if($timeStampLength > 0){
+        if ($timeStampLength > 0) {
             $bArray = self::_hexStr2Bytes($timeStamp);
-            for ($i=0;$i<strlen($bArray);$i++) {
+            for ($i = 0; $i < strlen($bArray); $i++) {
                 $msg [$i + $ocraSuiteLength + 1 + $counterLength + $questionLength + $passwordLength + $sessionInformationLength] = $bArray[$i];
             }
         }
@@ -255,19 +255,19 @@ 
     static function _oath_truncate($hash, $length = 6)
     {
         // Convert to dec
-        foreach(str_split($hash,2) as $hex)
+        foreach (str_split($hash, 2) as $hex)
         {
-            $hmac_result[]=hexdec($hex);
+            $hmac_result[] = hexdec($hex);
         }
     
         // Find offset
         $offset = $hmac_result[count($hmac_result) - 1] & 0xf;
     
         $v = strval(
-            (($hmac_result[$offset+0] & 0x7f) << 24 ) |
-            (($hmac_result[$offset+1] & 0xff) << 16 ) |
-            (($hmac_result[$offset+2] & 0xff) << 8 ) |
-            ($hmac_result[$offset+3] & 0xff)
+            (($hmac_result[$offset + 0] & 0x7f) << 24) |
+            (($hmac_result[$offset + 1] & 0xff) << 16) |
+            (($hmac_result[$offset + 2] & 0xff) << 8) |
+            ($hmac_result[$offset + 3] & 0xff)
         );	
         
         $v = substr($v, strlen($v) - $length);

library/tiqr/Tiqr/Message/Exception/MismatchSenderId.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/GCM.php

Spacing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
         }
 
         if ($error != null) {
-            throw new Tiqr_Message_Exception_SendFailure("Error in GCM response: " . $error, true);
+            throw new Tiqr_Message_Exception_SendFailure("Error in GCM response: ".$error, true);
         }
 
     }

library/tiqr/Tiqr/Message/Exception.php

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

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