Tiqr / tiqr-server-libphp

library/tiqr/OATH/OCRAParser.php

Doc Comments +3 added lines

@@ -238,6 +238,7 @@ 
 
 	/**
 	 * Borrowed from SimpleSAMLPHP http://simplesamlphp.org/
+	 * @param integer $length
 	 */
 	public static function generateRandomBytes($length, $fallback = TRUE) {
 		static $fp = NULL;
@@ -278,6 +279,8 @@ 
 
 	/**
 	 * Constant time string comparison, see http://codahale.com/a-lesson-in-timing-attacks/
+	 * @param string $s1
+	 * @param string $s2
 	 */
 	public static function constEqual($s1, $s2) {
 		if (strlen($s1) != strlen($s2)) {

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;
+    }
 
 }

library/tiqr/Tiqr/API/Client.php

Doc Comments +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
      * @param string $method	The HTTP Method (GET, POST, PUT, DELETE)
      * @param array  $data		Data send with request as key => value pairs
      *
-     * @return Object
+     * @return Tiqr_API_Entity_APIResult
      *
      * @throws Exception
      */

library/tiqr/Tiqr/Message/FCM.php

Doc Comments +2 added lines, -3 removed lines

@@ -48,11 +48,10 @@
     /**
      * Send a message to a device using the firebase API key.
      *
-     * @param $deviceToken string device ID
-     * @param $alert string alert message
+     * @param string $deviceToken string device ID
+     * @param string $alert string alert message
      * @param $challenge string tiqr challenge url
      * @param $apiKey string api key for firebase
-     * @param Tiqr_Message_Exception $gcmException
      *
      * @throws Tiqr_Message_Exception_SendFailure
      */

library/tiqr/Tiqr/OATH/HOTP.php

Doc Comments +2 added lines, -2 removed lines

@@ -31,7 +31,7 @@ 
      * Calculate a HOTP response 
      * @param String $secret
      * @param String $counter
-     * @return String The response
+     * @return integer The response
      */
     public function calculateResponse($secret, $counter)
     {
@@ -72,7 +72,7 @@ 
      * Truncate a response to a certain length.
      * @param String $hash
      * @param int $length
-     * @return String a truncated response
+     * @return integer a truncated response
      */
     protected function _truncate($hash, $length = 6)
     {

Indentation +32 added lines, -32 removed lines

@@ -48,24 +48,24 @@ 
      */
     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[$i] = pack ('C*', $counter);
-             $counter = $counter >> 8;
-         }
-         $bin_counter = implode($cur_counter);
-         // Pad to 8 chars
-         if (strlen ($bin_counter) < 8)
-         {
-             $bin_counter = str_repeat (chr(0), 8 - strlen ($bin_counter)) . $bin_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[$i] = pack ('C*', $counter);
+                $counter = $counter >> 8;
+            }
+            $bin_counter = implode($cur_counter);
+            // Pad to 8 chars
+            if (strlen ($bin_counter) < 8)
+            {
+                $bin_counter = str_repeat (chr(0), 8 - strlen ($bin_counter)) . $bin_counter;
+            }
      
-         // HMAC
-         $hash = hash_hmac ('sha1', $bin_counter, $secret);
-         return $hash;
+            // HMAC
+            $hash = hash_hmac ('sha1', $bin_counter, $secret);
+            return $hash;
     }
  
     /**
@@ -76,22 +76,22 @@ 
      */
     protected function _truncate($hash, $length = 6)
     {
-         // Convert to dec
-         foreach(str_split($hash,2) as $hex)
-         {
-             $hmac_result[]=hexdec($hex);
-         }
+            // Convert to dec
+            foreach(str_split($hash,2) as $hex)
+            {
+                $hmac_result[]=hexdec($hex);
+            }
      
-         // Find offset
-         $offset = $hmac_result[19] & 0xf;  
+            // Find offset
+            $offset = $hmac_result[19] & 0xf;  
      
-         // 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);
+            // 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);
     }
 }

library/tiqr/Tiqr/OATH/OCRA.php

Doc Comments +11 added lines, -4 removed lines

@@ -32,6 +32,9 @@ 
      * @param String crypto     the crypto algorithm (sha1, sha256 or sha512)
      * @param String keyBytes   the bytes to use for the HMAC key
      * @param String text       the message or text to be authenticated.
+     * @param string $crypto
+     * @param string $keyBytes
+     * @param string $text
      */
     private static function _hmac_sha1($crypto,
             $keyBytes,
@@ -58,19 +61,22 @@ 
      * set of parameters.
      *
      * @param ocraSuite    the OCRA Suite
-     * @param key          the shared secret, HEX encoded
-     * @param counter      the counter that changes
+     * @param key          string shared secret, HEX encoded
+     * @param counter      string counter that changes
      *                     on a per use basis,
      *                     HEX encoded
-     * @param question     the challenge question, HEX encoded
+     * @param question     string challenge question, HEX encoded
      * @param password     a password that can be used,
      *                     HEX encoded
      * @param sessionInformation
      *                     Static information that identifies the
      *                     current session, Hex encoded
      * @param timeStamp    a value that reflects a time
+     * @param string $password
+     * @param string $sessionInformation
+     * @param string $timeStamp
      *
-     * @return A numeric String in base 10 that includes
+     * @return string numeric String in base 10 that includes
      * {@link truncationDigits} digits
      */
     static function generateOCRA($ocraSuite,
@@ -251,6 +257,7 @@ 
 
     /**
      * Truncate a result to a certain length
+     * @param string $hash
      */    
     static function _oath_truncate($hash, $length = 6)
     {

Indentation +8 added lines, -8 removed lines

@@ -37,8 +37,8 @@ 
             $keyBytes,
             $text)
     {
-         $hash = hash_hmac ($crypto, $text, $keyBytes);
-         return $hash;
+            $hash = hash_hmac ($crypto, $text, $keyBytes);
+            return $hash;
     }
 
     /**
@@ -74,12 +74,12 @@ 
      * {@link truncationDigits} digits
      */
     static function generateOCRA($ocraSuite,
-                                 $key,
-                                 $counter,
-                                 $question,
-                                 $password,
-                                 $sessionInformation,
-                                 $timeStamp)
+                                    $key,
+                                    $counter,
+                                    $question,
+                                    $password,
+                                    $sessionInformation,
+                                    $timeStamp)
     {
         $codeDigits = 0;
         $crypto = "";

library/tiqr/Tiqr/OATH/OCRA_v1.php

Doc Comments +12 added lines, -5 removed lines

@@ -41,6 +41,9 @@ 
      * @param String crypto     the crypto algorithm (sha1, sha256 or sha512)
      * @param String keyBytes   the bytes to use for the HMAC key
      * @param String text       the message or text to be authenticated.
+     * @param string $crypto
+     * @param string $keyBytes
+     * @param string $text
      */
     private static function _hmac_sha1($crypto,
             $keyBytes,
@@ -66,20 +69,23 @@ 
      * This method generates an OCRA HOTP value for the given
      * set of parameters.
      *
-     * @param ocraSuite    the OCRA Suite
-     * @param key          the shared secret, HEX encoded
-     * @param counter      the counter that changes
+     * @param ocraSuite    string OCRA Suite
+     * @param key          string shared secret, HEX encoded
+     * @param counter      string counter that changes
      *                     on a per use basis,
      *                     HEX encoded
-     * @param question     the challenge question, HEX encoded
+     * @param question     string challenge question, HEX encoded
      * @param password     a password that can be used,
      *                     HEX encoded
      * @param sessionInformation
      *                     Static information that identifies the
      *                     current session, Hex encoded
      * @param timeStamp    a value that reflects a time
+     * @param string $password
+     * @param string $sessionInformation
+     * @param string $timeStamp
      *
-     * @return A numeric String in base 10 that includes
+     * @return integer numeric String in base 10 that includes
      * {@link truncationDigits} digits
      */
     static function generateOCRA($ocraSuite,
@@ -223,6 +229,7 @@ 
 
     /**
      * Truncate a result to a certain length
+     * @param string $hash
      */    
     function _oath_truncate($hash, $length = 6)
     {

Indentation +8 added lines, -8 removed lines

@@ -46,8 +46,8 @@ 
             $keyBytes,
             $text)
     {
-         $hash = hash_hmac ($crypto, $text, $keyBytes);
-         return $hash;
+            $hash = hash_hmac ($crypto, $text, $keyBytes);
+            return $hash;
     }
 
     /**
@@ -83,12 +83,12 @@ 
      * {@link truncationDigits} digits
      */
     static function generateOCRA($ocraSuite,
-                                 $key,
-                                 $counter,
-                                 $question,
-                                 $password,
-                                 $sessionInformation,
-                                 $timeStamp)
+                                    $key,
+                                    $counter,
+                                    $question,
+                                    $password,
+                                    $sessionInformation,
+                                    $timeStamp)
     {
         $codeDigits = 0;
         $crypto = "";

library/tiqr/Tiqr/OATH/OCRAWrapper_v1.php

Doc Comments +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
      * @param String $secret a hex representation of the user's secret
      * @param String $challenge a hex or (alfa)numeric challenge question
      * @param String $sessionKey a hex sessionKey identifying the current session
-     * @return String An OCRA response, the length of which is determined by the
+     * @return integer An OCRA response, the length of which is determined by the
      *             OCRA suite.
      */
     public function calculateResponse($secret, $challenge, $sessionKey) 

Indentation +2 added lines, -2 removed lines

@@ -90,9 +90,9 @@
      */
     public function verifyResponse($response, $secret, $challenge, $sessionKey)
     {
-         $expected = $this->calculateResponse($secret, $challenge, $sessionKey);
+            $expected = $this->calculateResponse($secret, $challenge, $sessionKey);
 
-         return ($expected == $response);
+            return ($expected == $response);
     }
 
     /**

library/tiqr/Tiqr/Service.php

Doc Comments +1 added lines, -8 removed lines

@@ -334,10 +334,6 @@ 
      * application, for example to create a link in a mobile website on the
      * same device as where the application is installed
      * @param String $sessionKey The session key identifying this authentication session
-     * @param String $userId The userId of a pre-authenticated user, if in  
-     *                       step-up mode. NULL in other scenario's.
-     * @param String $sessionId The application's session identifier. 
-     *                          (defaults to php session)
      */
     public function generateAuthURL($sessionKey)
     {
@@ -613,7 +609,7 @@ 
      *                           session.
      * @param String $response   The response to the challenge that the phone
      *                           has posted.
-     * @return String The result of the authentication. This is one of the
+     * @return integer The result of the authentication. This is one of the
      *                AUTH_RESULT_* constants of the Tiqr_Server class.
      *                (do not make assumptions on the values of these 
      *                constants.)
@@ -710,9 +706,6 @@ 
     /**
      * Generate a challenge URL
      * @param String $sessionKey The key that identifies the session.
-     * @param String $challenge The authentication challenge
-     * @param String $userId The userid to embed in the challenge url (only
-     *                       if a user was pre-authenticated)
      *                       
      */
     protected function _getChallengeUrl($sessionKey)

Indentation +31 added lines, -31 removed lines

@@ -514,17 +514,17 @@ 
         }
 
         $metadata = array("service"=>
-                               array("displayName"       => $this->_name,
-                                     "identifier"        => $this->_identifier,
-                                     "logoUrl"           => $this->_logoUrl,
-                                     "infoUrl"           => $this->_infoUrl,
-                                     "authenticationUrl" => $authenticationUrl,
-                                     "ocraSuite"         => $this->_ocraSuite,
-                                     "enrollmentUrl"     => $enrollmentUrl
-                               ),
-                          "identity"=>
-                               array("identifier" =>$data["userId"],
-                                     "displayName"=>$data["displayName"]));
+                                array("displayName"       => $this->_name,
+                                        "identifier"        => $this->_identifier,
+                                        "logoUrl"           => $this->_logoUrl,
+                                        "infoUrl"           => $this->_infoUrl,
+                                        "authenticationUrl" => $authenticationUrl,
+                                        "ocraSuite"         => $this->_ocraSuite,
+                                        "enrollmentUrl"     => $enrollmentUrl
+                                ),
+                            "identity"=>
+                                array("identifier" =>$data["userId"],
+                                        "displayName"=>$data["displayName"]));
 
         $this->_stateStorage->unsetValue("enroll".$enrollmentKey);
 
@@ -547,10 +547,10 @@ 
      */
     public function getEnrollmentSecret($enrollmentKey)
     {
-         $data = $this->_stateStorage->getValue("enroll".$enrollmentKey);
-         $secret = $this->_uniqueSessionKey("enrollmentsecret");
-         $this->_stateStorage->setValue("enrollsecret".$secret, array("userId"=>$data["userId"], "sessionId"=>$data["sessionId"]), self::ENROLLMENT_EXPIRE); 
-         return $secret;
+            $data = $this->_stateStorage->getValue("enroll".$enrollmentKey);
+            $secret = $this->_uniqueSessionKey("enrollmentsecret");
+            $this->_stateStorage->setValue("enrollsecret".$secret, array("userId"=>$data["userId"], "sessionId"=>$data["sessionId"]), self::ENROLLMENT_EXPIRE); 
+            return $secret;
     } 
 
     /**
@@ -565,13 +565,13 @@ 
      */
     public function validateEnrollmentSecret($enrollmentSecret)
     {
-         $data = $this->_stateStorage->getValue("enrollsecret".$enrollmentSecret);
-         if (is_array($data)) { 
-             // Secret is valid, application may accept the user secret. 
-             $this->_setEnrollmentStatus($data["sessionId"], self::ENROLLMENT_STATUS_PROCESSED);
-             return $data["userId"];
-         }
-         return false;
+            $data = $this->_stateStorage->getValue("enrollsecret".$enrollmentSecret);
+            if (is_array($data)) { 
+                // Secret is valid, application may accept the user secret. 
+                $this->_setEnrollmentStatus($data["sessionId"], self::ENROLLMENT_STATUS_PROCESSED);
+                return $data["userId"];
+            }
+            return false;
     }
     
     /**
@@ -588,13 +588,13 @@ 
      */
     public function finalizeEnrollment($enrollmentSecret) 
     {
-         $data = $this->_stateStorage->getValue("enrollsecret".$enrollmentSecret);
-         if (is_array($data)) {
-             // Enrollment is finalized, destroy our session data.
-             $this->_setEnrollmentStatus($data["sessionId"], self::ENROLLMENT_STATUS_FINALIZED);
-             $this->_stateStorage->unsetValue("enrollsecret".$enrollmentSecret);
-         }
-         return true;
+            $data = $this->_stateStorage->getValue("enrollsecret".$enrollmentSecret);
+            if (is_array($data)) {
+                // Enrollment is finalized, destroy our session data.
+                $this->_setEnrollmentStatus($data["sessionId"], self::ENROLLMENT_STATUS_FINALIZED);
+                $this->_stateStorage->unsetValue("enrollsecret".$enrollmentSecret);
+            }
+            return true;
     }
 
     /**
@@ -630,7 +630,7 @@ 
 
         $challengeUserId = NULL;
         if (isset($state["userId"])) {
-          $challengeUserId = $state["userId"];
+            $challengeUserId = $state["userId"];
         }
         // Check if we're dealing with a second factor
         if ($challengeUserId!=NULL && ($userId != $challengeUserId)) {
@@ -769,6 +769,6 @@ 
      */
     protected function _setEnrollmentStatus($sessionId, $status)
     {
-       $this->_stateStorage->setValue("enrollstatus".$sessionId, $status, self::ENROLLMENT_EXPIRE);
+        $this->_stateStorage->setValue("enrollstatus".$sessionId, $status, self::ENROLLMENT_EXPIRE);
     }
 }

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

Doc Comments +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
      *
      * @param String $data Data to encrypt.
      *
-     * @return encrypted data
+     * @return string data
      */
     public function encrypt($data)
     {
@@ -52,7 +52,7 @@ 
      *
      * @param String $data Data to decrypt.
      *
-     * @return decrypted data
+     * @return string data
      */
     public function decrypt($data)
     {

Indentation +1 added lines, -1 removed lines

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