Upload files to 'classes'

classes/tracker.class.php

@@ -1,187 +1,193 @@
-<?
+<?php
 // TODO: Turn this into a class with nice functions like update_user, delete_torrent, etc.
-class Tracker {
-  const STATS_MAIN = 0;
-  const STATS_USER = 1;
+class Tracker
+{
+    const STATS_MAIN = 0;
+    const STATS_USER = 1;
 
-  public static $Requests = [];
+    public static $Requests = [];
 
-  /**
-   * Send a GET request over a socket directly to the tracker
-   * For example, Tracker::update_tracker('change_passkey', array('oldpasskey' => OLD_PASSKEY, 'newpasskey' => NEW_PASSKEY)) will send the request:
-   * GET /tracker_32_char_secret_code/update?action=change_passkey&oldpasskey=OLD_PASSKEY&newpasskey=NEW_PASSKEY HTTP/1.1
-   *
-   * @param string $Action The action to send
-   * @param array $Updates An associative array of key->value pairs to send to the tracker
-   * @param boolean $ToIRC Sends a message to the channel #tracker with the GET URL.
-   */
-  public static function update_tracker($Action, $Updates, $ToIRC = false) {
-    // Build request
-    $Get = TRACKER_SECRET . "/update?action=$Action";
-    foreach ($Updates as $Key => $Value) {
-      $Get .= "&$Key=$Value";
-    }
+    /**
+     * Send a GET request over a socket directly to the tracker
+     * For example, Tracker::update_tracker('change_passkey', array('oldpasskey' => OLD_PASSKEY, 'newpasskey' => NEW_PASSKEY)) will send the request:
+     * GET /tracker_32_char_secret_code/update?action=change_passkey&oldpasskey=OLD_PASSKEY&newpasskey=NEW_PASSKEY HTTP/1.1
+     *
+     * @param string $Action The action to send
+     * @param array $Updates An associative array of key->value pairs to send to the tracker
+     * @param boolean $ToIRC Sends a message to the channel #tracker with the GET URL.
+     */
+    public static function update_tracker($Action, $Updates, $ToIRC = false)
+    {
+        // Build request
+        $Get = TRACKER_SECRET . "/update?action=$Action";
+        foreach ($Updates as $Key => $Value) {
+            $Get .= "&$Key=$Value";
+        }
 
-    $MaxAttempts = 3;
-    // don't wait around if we're debugging
-    if (DEBUG_MODE) {
-      $MaxAttempts = 1;
-    }
+        $MaxAttempts = 3;
+        // don't wait around if we're debugging
+        if (DEBUG_MODE) {
+            $MaxAttempts = 1;
+        }
 
-    $Err = false;
-    if (self::send_request($Get, $MaxAttempts, $Err) === false) {
-      send_irc("PRIVMSG " . BOT_DEBUG_CHAN . " :$MaxAttempts $Err $Get");
-      if (G::$Cache->get_value('ocelot_error_reported') === false) {
-        send_irc('PRIVMSG ' . ADMIN_CHAN . " :Failed to update ocelot: $Err : $Get");
-        G::$Cache->cache_value('ocelot_error_reported', true, 3600);
-      }
-      return false;
+        $Err = false;
+        if (self::send_request($Get, $MaxAttempts, $Err) === false) {
+            send_irc("PRIVMSG " . BOT_DEBUG_CHAN . " :$MaxAttempts $Err $Get");
+            if (G::$Cache->get_value('ocelot_error_reported') === false) {
+                send_irc('PRIVMSG ' . ADMIN_CHAN . " :Failed to update ocelot: $Err : $Get");
+                G::$Cache->cache_value('ocelot_error_reported', true, 3600);
+            }
+            return false;
+        }
+        return true;
     }
-    return true;
-  }
 
-  /**
-   * Get global peer stats from the tracker
-   *
-   * @return array(0 => $Leeching, 1 => $Seeding) or false if request failed
-   */
-  public static function global_peer_count() {
-    $Stats = self::get_stats(self::STATS_MAIN);
-    if (isset($Stats['leechers tracked']) && isset($Stats['seeders tracked'])) {
-      $Leechers = $Stats['leechers tracked'];
-      $Seeders = $Stats['seeders tracked'];
-    } else {
-      return false;
+    /**
+     * Get global peer stats from the tracker
+     *
+     * @return array(0 => $Leeching, 1 => $Seeding) or false if request failed
+     */
+    public static function global_peer_count()
+    {
+        $Stats = self::get_stats(self::STATS_MAIN);
+        if (isset($Stats['leechers tracked']) && isset($Stats['seeders tracked'])) {
+            $Leechers = $Stats['leechers tracked'];
+            $Seeders = $Stats['seeders tracked'];
+        } else {
+            return false;
+        }
+        return array($Leechers, $Seeders);
     }
-    return array($Leechers, $Seeders);
-  }
 
-  /**
-   * Get peer stats for a user from the tracker
-   *
-   * @param string $TorrentPass The user's pass key
-   * @return array(0 => $Leeching, 1 => $Seeding) or false if the request failed
-   */
-  public static function user_peer_count($TorrentPass) {
-    $Stats = self::get_stats(self::STATS_USER, array('key' => $TorrentPass));
-    if ($Stats === false) {
-      return false;
-    }
-    if (isset($Stats['leeching']) && isset($Stats['seeding'])) {
-      $Leeching = $Stats['leeching'];
-      $Seeding = $Stats['seeding'];
-    } else {
-      // User doesn't exist, but don't tell anyone
-      $Leeching = $Seeding = 0;
+    /**
+     * Get peer stats for a user from the tracker
+     *
+     * @param string $TorrentPass The user's pass key
+     * @return array(0 => $Leeching, 1 => $Seeding) or false if the request failed
+     */
+    public static function user_peer_count($TorrentPass)
+    {
+        $Stats = self::get_stats(self::STATS_USER, array('key' => $TorrentPass));
+        if ($Stats === false) {
+            return false;
+        }
+        if (isset($Stats['leeching']) && isset($Stats['seeding'])) {
+            $Leeching = $Stats['leeching'];
+            $Seeding = $Stats['seeding'];
+        } else {
+            // User doesn't exist, but don't tell anyone
+            $Leeching = $Seeding = 0;
+        }
+        return array($Leeching, $Seeding);
     }
-    return array($Leeching, $Seeding);
-  }
 
-  /**
-   * Get whatever info the tracker has to report
-   *
-   * @return results from get_stats()
-   */
-  public static function info() {
-    return self::get_stats(self::STATS_MAIN);
-  }
-
-  /**
-   * Send a stats request to the tracker and process the results
-   *
-   * @param int $Type Stats type to get
-   * @param array $Params Parameters required by stats type
-   * @return array with stats in named keys or false if the request failed
-   */
-  private static function get_stats($Type, $Params = false) {
-    if (!defined('TRACKER_REPORTKEY')) {
-      return false;
-    }
-    $Get = TRACKER_REPORTKEY . '/report?';
-    if ($Type === self::STATS_MAIN) {
-      $Get .= 'get=stats';
-    } elseif ($Type === self::STATS_USER && !empty($Params['key'])) {
-      $Get .= "get=user&key=$Params[key]";
-    } else {
-      return false;
+    /**
+     * Get whatever info the tracker has to report
+     *
+     * @return results from get_stats()
+     */
+    public static function info()
+    {
+        return self::get_stats(self::STATS_MAIN);
     }
-    $Response = self::send_request($Get);
-    if ($Response === false) {
-      return false;
-    }
-    $Stats = [];
-    foreach (explode("\n", $Response) as $Stat) {
-      list($Val, $Key) = explode(" ", $Stat, 2);
-      $Stats[$Key] = $Val;
+
+    /**
+     * Send a stats request to the tracker and process the results
+     *
+     * @param int $Type Stats type to get
+     * @param array $Params Parameters required by stats type
+     * @return array with stats in named keys or false if the request failed
+     */
+    private static function get_stats($Type, $Params = false)
+    {
+        if (!defined('TRACKER_REPORTKEY')) {
+            return false;
+        }
+        $Get = TRACKER_REPORTKEY . '/report?';
+        if ($Type === self::STATS_MAIN) {
+            $Get .= 'get=stats';
+        } elseif ($Type === self::STATS_USER && !empty($Params['key'])) {
+            $Get .= "get=user&key=$Params[key]";
+        } else {
+            return false;
+        }
+        $Response = self::send_request($Get);
+        if ($Response === false) {
+            return false;
+        }
+        $Stats = [];
+        foreach (explode("\n", $Response) as $Stat) {
+            list($Val, $Key) = explode(" ", $Stat, 2);
+            $Stats[$Key] = $Val;
+        }
+        return $Stats;
     }
-    return $Stats;
-  }
 
-  /**
-   * Send a request to the tracker
-   *
-   * @param string $Path GET string to send to the tracker
-   * @param int $MaxAttempts Maximum number of failed attempts before giving up
-   * @param $Err Variable to use as storage for the error string if the request fails
-   * @return tracker response message or false if the request failed
-   */
-  private static function send_request($Get, $MaxAttempts = 1, &$Err = false) {
-    $Header = "GET /$Get HTTP/1.1\r\nConnection: Close\r\n\r\n";
-    $Attempts = 0;
-    $Sleep = 0;
-    $Success = false;
-    $StartTime = microtime(true);
-    while (!$Success && $Attempts++ < $MaxAttempts) {
-      if ($Sleep) {
-        sleep($Sleep);
-      }
+    /**
+     * Send a request to the tracker
+     *
+     * @param string $Path GET string to send to the tracker
+     * @param int $MaxAttempts Maximum number of failed attempts before giving up
+     * @param $Err Variable to use as storage for the error string if the request fails
+     * @return tracker response message or false if the request failed
+     */
+    private static function send_request($Get, $MaxAttempts = 1, &$Err = false)
+    {
+        $Header = "GET /$Get HTTP/1.1\r\nConnection: Close\r\n\r\n";
+        $Attempts = 0;
+        $Sleep = 0;
+        $Success = false;
+        $StartTime = microtime(true);
+        while (!$Success && $Attempts++ < $MaxAttempts) {
+            if ($Sleep) {
+                sleep($Sleep);
+            }
 
-      // spend some time retrying if we're not in DEBUG_MODE
-      if (!DEBUG_MODE) {
-        $Sleep = 6;
-      }
+            // spend some time retrying if we're not in DEBUG_MODE
+            if (!DEBUG_MODE) {
+                $Sleep = 6;
+            }
 
-      // Send request
-      $File = fsockopen(TRACKER_HOST, TRACKER_PORT, $ErrorNum, $ErrorString);
-      if ($File) {
-        if (fwrite($File, $Header) === false) {
-          $Err = "Failed to fwrite()";
-          $Sleep = 3;
-          continue;
-        }
-      } else {
-        $Err = "Failed to fsockopen() - $ErrorNum - $ErrorString";
-        continue;
-      }
+            // Send request
+            $File = fsockopen(TRACKER_HOST, TRACKER_PORT, $ErrorNum, $ErrorString);
+            if ($File) {
+                if (fwrite($File, $Header) === false) {
+                    $Err = "Failed to fwrite()";
+                    $Sleep = 3;
+                    continue;
+                }
+            } else {
+                $Err = "Failed to fsockopen() - $ErrorNum - $ErrorString";
+                continue;
+            }
 
-      // Check for response.
-      $Response = '';
-      while (!feof($File)) {
-        $Response .= fread($File, 1024);
-      }
-      $DataStart = strpos($Response, "\r\n\r\n") + 4;
-      $DataEnd = strrpos($Response, "\n");
-      if ($DataEnd > $DataStart) {
-        $Data = substr($Response, $DataStart, $DataEnd - $DataStart);
-      } else {
-        $Data = "";
-      }
-      $Status = substr($Response, $DataEnd + 1);
-      if ($Status == "success") {
-        $Success = true;
-      }
-    }
-    $Request = array(
-      'path' => substr($Get, strpos($Get, '/')),
-      'response' => ($Success ? $Data : $Response),
-      'status' => ($Success ? 'ok' : 'failed'),
-      'time' => 1000 * (microtime(true) - $StartTime)
-    );
-    self::$Requests[] = $Request;
-    if ($Success) {
-      return $Data;
+            // Check for response.
+            $Response = '';
+            while (!feof($File)) {
+                $Response .= fread($File, 1024);
+            }
+            $DataStart = strpos($Response, "\r\n\r\n") + 4;
+            $DataEnd = strrpos($Response, "\n");
+            if ($DataEnd > $DataStart) {
+                $Data = substr($Response, $DataStart, $DataEnd - $DataStart);
+            } else {
+                $Data = "";
+            }
+            $Status = substr($Response, $DataEnd + 1);
+            if ($Status == "success") {
+                $Success = true;
+            }
+        }
+        $Request = array(
+        'path' => substr($Get, strpos($Get, '/')),
+        'response' => ($Success ? $Data : $Response),
+        'status' => ($Success ? 'ok' : 'failed'),
+        'time' => 1000 * (microtime(true) - $StartTime)
+        );
+        self::$Requests[] = $Request;
+        if ($Success) {
+            return $Data;
+        }
+        return false;
     }
-    return false;
-  }
 }
-?>

classes/twofa.class.php

@@ -1,126 +1,137 @@
 <?php
 
-class TwoFactorAuth {
-  private $algorithm;
-  private $period;
-  private $digits;
-  private $issuer;
-  private static $_base32dict = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567=';
-  private static $_base32;
-  private static $_base32lookup = [];
-  private static $_supportedalgos = array('sha1', 'sha256', 'sha512', 'md5');
-
-  function __construct($issuer = null, $digits = 6, $period = 30, $algorithm = 'sha1') {
-    $this->issuer = $issuer;
-    $this->digits = $digits;
-    $this->period = $period;
-
-    $algorithm = strtolower(trim($algorithm));
-    if (!in_array($algorithm, self::$_supportedalgos)){
-      $algorithm = 'sha1';
+class TwoFactorAuth
+{
+    private $algorithm;
+    private $period;
+    private $digits;
+    private $issuer;
+    private static $_base32dict = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567=';
+    private static $_base32;
+    private static $_base32lookup = [];
+    private static $_supportedalgos = array('sha1', 'sha256', 'sha512', 'md5');
+
+    public function __construct($issuer = null, $digits = 6, $period = 30, $algorithm = 'sha1')
+    {
+        $this->issuer = $issuer;
+        $this->digits = $digits;
+        $this->period = $period;
+
+        $algorithm = strtolower(trim($algorithm));
+        if (!in_array($algorithm, self::$_supportedalgos)) {
+            $algorithm = 'sha1';
+        }
+        $this->algorithm = $algorithm;
+
+        self::$_base32 = str_split(self::$_base32dict);
+        self::$_base32lookup = array_flip(self::$_base32);
     }
-    $this->algorithm = $algorithm;
-
-    self::$_base32 = str_split(self::$_base32dict);
-    self::$_base32lookup = array_flip(self::$_base32);
-  }
-
-  public function createSecret($bits = 210) {
-    $secret = '';
-    $bytes = ceil($bits / 5); //We use 5 bits of each byte (since we have a 32-character 'alphabet' / BASE32)
-    $rnd = random_bytes($bytes);
-    for ($i = 0; $i < $bytes; $i++) {
-      $secret .= self::$_base32[ord($rnd[$i]) & 31]; //Mask out left 3 bits for 0-31 values
+
+    public function createSecret($bits = 210)
+    {
+        $secret = '';
+        $bytes = ceil($bits / 5); //We use 5 bits of each byte (since we have a 32-character 'alphabet' / BASE32)
+        $rnd = random_bytes($bytes);
+        for ($i = 0; $i < $bytes; $i++) {
+            $secret .= self::$_base32[ord($rnd[$i]) & 31]; //Mask out left 3 bits for 0-31 values
+        }
+        return $secret;
     }
-    return $secret;
-  }
-
-  // Calculate the code with given secret and point in time
-  public function getCode($secret, $time = null) {
-    $secretkey = $this->base32Decode($secret);
-
-    $timestamp = "\0\0\0\0" . pack('N*', $this->getTimeSlice($this->getTime($time)));  // Pack time into binary string
-    $hashhmac = hash_hmac($this->algorithm, $timestamp, $secretkey, true);             // Hash it with users secret key
-    $hashpart = substr($hashhmac, ord(substr($hashhmac, -1)) & 0x0F, 4);               // Use last nibble of result as index/offset and grab 4 bytes of the result
-    $value = unpack('N', $hashpart);                                                   // Unpack binary value
-    $value = $value[1] & 0x7FFFFFFF;                                                   // Drop MSB, keep only 31 bits
-
-    return str_pad($value % pow(10, $this->digits), $this->digits, '0', STR_PAD_LEFT);
-  }
-
-  // Check if the code is correct. This will accept codes starting from now +/- ($discrepancy * period) seconds
-  public function verifyCode($secret, $code, $discrepancy = 1, $time = null) {
-    $result = false;
-    $timetamp = $this->getTime($time);
-
-    // Always iterate all possible codes to prevent timing-attacks
-    for ($i = -$discrepancy; $i <= $discrepancy; $i++) {
-      $result |= hash_equals($this->getCode($secret, $timetamp + ($i * $this->period)), $code);
+
+    // Calculate the code with given secret and point in time
+    public function getCode($secret, $time = null)
+    {
+        $secretkey = $this->base32Decode($secret);
+
+        $timestamp = "\0\0\0\0" . pack('N*', $this->getTimeSlice($this->getTime($time)));  // Pack time into binary string
+        $hashhmac = hash_hmac($this->algorithm, $timestamp, $secretkey, true);             // Hash it with users secret key
+        $hashpart = substr($hashhmac, ord(substr($hashhmac, -1)) & 0x0F, 4);               // Use last nibble of result as index/offset and grab 4 bytes of the result
+        $value = unpack('N', $hashpart);                                                   // Unpack binary value
+        $value = $value[1] & 0x7FFFFFFF;                                                   // Drop MSB, keep only 31 bits
+
+        return str_pad($value % pow(10, $this->digits), $this->digits, '0', STR_PAD_LEFT);
     }
 
-    return (bool)$result;
-  }
-
-  // Get data-uri of QRCode
-  public function getQRCodeImageAsDataUri($label, $secret, $size = 300) {
-
-    if (exec('which qrencode')) {
-      $QRCodeImage = shell_exec("qrencode -s ".(int)($size/40)." -m 3 -o - '".$this->getQRText($label, $secret)."'");
-    } else {
-      $curlhandle = curl_init();
-
-      curl_setopt_array($curlhandle, array(
-        CURLOPT_URL => 'https://chart.googleapis.com/chart?cht=qr&chs='.$size.'x'.$size.'&chld=L|1&chl='.rawurlencode($this->getQRText($label, $secret)),
-        CURLOPT_RETURNTRANSFER => true,
-        CURLOPT_CONNECTTIMEOUT => 10,
-        CURLOPT_DNS_CACHE_TIMEOUT => 10,
-        CURLOPT_TIMEOUT => 10,
-        CURLOPT_SSL_VERIFYPEER => false,
-        CURLOPT_USERAGENT => 'TwoFactorAuth'
-      ));
-
-      $QRCodeImage = curl_exec($curlhandle);
-      curl_close($curlhandle);
+    // Check if the code is correct. This will accept codes starting from now +/- ($discrepancy * period) seconds
+    public function verifyCode($secret, $code, $discrepancy = 1, $time = null)
+    {
+        $result = false;
+        $timetamp = $this->getTime($time);
+
+        // Always iterate all possible codes to prevent timing-attacks
+        for ($i = -$discrepancy; $i <= $discrepancy; $i++) {
+            $result |= hash_equals($this->getCode($secret, $timetamp + ($i * $this->period)), $code);
+        }
+
+        return (bool)$result;
     }
 
-    return 'data:image/png;base64,'.base64_encode($QRCodeImage);
-  }
-
-  private function getTime($time) {
-    return ($time === null) ? time() : $time;
-  }
-
-  private function getTimeSlice($time = null, $offset = 0) {
-    return (int)floor($time / $this->period) + ($offset * $this->period);
-  }
-
-  // Builds a string to be encoded in a QR code
-  public function getQRText($label, $secret) {
-    $QRText = 'otpauth://totp/'.rawurlencode($label).'?secret='.rawurlencode($secret);
-    $QRText .= ($this->issuer) ? '&issuer='.rawurlencode($this->issuer) : '';
-    $QRText .= ($this->period != 30) ? '&period='.intval($this->period) : '';
-    $QRText .= ($this->algorithm != 'sha1') ? '&algorithm='.rawurlencode(strtoupper($this->algorithm)) : '';
-    $QRText .= ($this->digits != 6) ? '&digits='.intval($this->digits) : '';
-    return $QRText;
-  }
-
-  private function base32Decode($value) {
-    if (strlen($value)==0) { return ''; }
-
-    $buffer = '';
-    foreach (str_split($value) as $char) {
-      if ($char !== '=') {
-        $buffer .= str_pad(decbin(self::$_base32lookup[$char]), 5, 0, STR_PAD_LEFT);
-      }
+    // Get data-uri of QRCode
+    public function getQRCodeImageAsDataUri($label, $secret, $size = 300)
+    {
+        if (exec('which qrencode')) {
+            $QRCodeImage = shell_exec("qrencode -s ".(int)($size/40)." -m 3 -o - '".$this->getQRText($label, $secret)."'");
+        } else {
+            $curlhandle = curl_init();
+
+            curl_setopt_array($curlhandle, array(
+            CURLOPT_URL => 'https://chart.googleapis.com/chart?cht=qr&chs='.$size.'x'.$size.'&chld=L|1&chl='.rawurlencode($this->getQRText($label, $secret)),
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_CONNECTTIMEOUT => 10,
+            CURLOPT_DNS_CACHE_TIMEOUT => 10,
+            CURLOPT_TIMEOUT => 10,
+            CURLOPT_SSL_VERIFYPEER => false,
+            CURLOPT_USERAGENT => 'TwoFactorAuth'
+            ));
+
+            $QRCodeImage = curl_exec($curlhandle);
+            curl_close($curlhandle);
+        }
+
+        return 'data:image/png;base64,'.base64_encode($QRCodeImage);
     }
-    $length = strlen($buffer);
-    $blocks = trim(chunk_split(substr($buffer, 0, $length - ($length % 8)), 8, ' '));
 
-    $output = '';
-    foreach (explode(' ', $blocks) as $block) {
-      $output .= chr(bindec(str_pad($block, 8, 0, STR_PAD_RIGHT)));
+    private function getTime($time)
+    {
+        return ($time === null) ? time() : $time;
     }
 
-    return $output;
-  }
+    private function getTimeSlice($time = null, $offset = 0)
+    {
+        return (int)floor($time / $this->period) + ($offset * $this->period);
+    }
+
+    // Builds a string to be encoded in a QR code
+    public function getQRText($label, $secret)
+    {
+        $QRText = 'otpauth://totp/'.rawurlencode($label).'?secret='.rawurlencode($secret);
+        $QRText .= ($this->issuer) ? '&issuer='.rawurlencode($this->issuer) : '';
+        $QRText .= ($this->period != 30) ? '&period='.intval($this->period) : '';
+        $QRText .= ($this->algorithm != 'sha1') ? '&algorithm='.rawurlencode(strtoupper($this->algorithm)) : '';
+        $QRText .= ($this->digits != 6) ? '&digits='.intval($this->digits) : '';
+        return $QRText;
+    }
+
+    private function base32Decode($value)
+    {
+        if (strlen($value)==0) {
+            return '';
+        }
+
+        $buffer = '';
+        foreach (str_split($value) as $char) {
+            if ($char !== '=') {
+                $buffer .= str_pad(decbin(self::$_base32lookup[$char]), 5, 0, STR_PAD_LEFT);
+            }
+        }
+        $length = strlen($buffer);
+        $blocks = trim(chunk_split(substr($buffer, 0, $length - ($length % 8)), 8, ' '));
+
+        $output = '';
+        foreach (explode(' ', $blocks) as $block) {
+            $output .= chr(bindec(str_pad($block, 8, 0, STR_PAD_RIGHT)));
+        }
+
+        return $output;
+    }
 }

classes/u2f.class.php

@@ -73,334 +73,346 @@ const ERR_OLD_OPENSSL = 11;
 
 const PUBKEY_LEN = 65;
 
-class U2F {
-  private $appId;
+class U2F
+{
+    private $appId;
 
-  private $attestDir;
+    private $attestDir;
 
-  private $FIXCERTS = array(
+    private $FIXCERTS = array(
     '349bca1031f8c82c4ceca38b9cebf1a69df9fb3b94eed99eb3fb9aa3822d26e8',
     'dd574527df608e47ae45fbba75a2afdd5c20fd94a02419381813cd55a2a3398f',
     '1d8764f0f7cd1352df6150045c8f638e517270e8b5dda1c63ade9c2280240cae',
     'd0edc9a91a1677435a953390865d208c55b3183c6759c9b5a7ff494c322558eb',
     '6073c436dcd064a48127ddbf6032ac1a66fd59a0c24434f070d4e564c124c897',
     'ca993121846c464d666096d35f13bf44c1b05af205f9b4a1e00cf6cc10c5e511'
-  );
-
-  /**
-   * @param string $appId Application id for the running application
-   * @param string|null $attestDir Directory where trusted attestation roots may be found
-   * @throws Error If OpenSSL older than 1.0.0 is used
-   */
-  public function __construct($appId, $attestDir = null) {
-    if (OPENSSL_VERSION_NUMBER < 0x10000000) {
-      throw new Error('OpenSSL has to be at least version 1.0.0, this is ' . OPENSSL_VERSION_TEXT, ERR_OLD_OPENSSL);
-    }
-    $this->appId = $appId;
-    $this->attestDir = $attestDir;
-  }
-
-  /**
-   * Called to get a registration request to send to a user.
-   * Returns an array of one registration request and a array of sign requests.
-   *
-   * @param array $registrations List of current registrations for this
-   * user, to prevent the user from registering the same authenticator several
-   * times.
-   * @return array An array of two elements, the first containing a
-   * RegisterRequest the second being an array of SignRequest
-   * @throws Error
-   */
-  public function getRegisterData(array $registrations = []) {
-    $challenge = $this->createChallenge();
-    $request = new RegisterRequest($challenge, $this->appId);
-    $signs = $this->getAuthenticateData($registrations);
-    return [$request, $signs];
-  }
-
-  /**
-   * Called to verify and unpack a registration message.
-   *
-   * @param RegisterRequest $request this is a reply to
-   * @param object $response response from a user
-   * @param bool $includeCert set to true if the attestation certificate should be
-   * included in the returned Registration object
-   * @return Registration
-   * @throws Error
-   */
-  public function doRegister($request, $response, $includeCert = true) {
-    if (!is_object($request)) {
-      throw new \InvalidArgumentException('$request of doRegister() method only accepts object.');
-    }
+    );
 
-    if (!is_object($response)) {
-      throw new \InvalidArgumentException('$response of doRegister() method only accepts object.');
+    /**
+     * @param string $appId Application id for the running application
+     * @param string|null $attestDir Directory where trusted attestation roots may be found
+     * @throws Error If OpenSSL older than 1.0.0 is used
+     */
+    public function __construct($appId, $attestDir = null)
+    {
+        if (OPENSSL_VERSION_NUMBER < 0x10000000) {
+            throw new Error('OpenSSL has to be at least version 1.0.0, this is ' . OPENSSL_VERSION_TEXT, ERR_OLD_OPENSSL);
+        }
+        $this->appId = $appId;
+        $this->attestDir = $attestDir;
     }
 
-    if (property_exists($response, 'errorCode') && $response->errorCode !== 0) {
-      throw new Error('User-agent returned error. Error code: ' . $response->errorCode, ERR_BAD_UA_RETURNING );
+    /**
+     * Called to get a registration request to send to a user.
+     * Returns an array of one registration request and a array of sign requests.
+     *
+     * @param array $registrations List of current registrations for this
+     * user, to prevent the user from registering the same authenticator several
+     * times.
+     * @return array An array of two elements, the first containing a
+     * RegisterRequest the second being an array of SignRequest
+     * @throws Error
+     */
+    public function getRegisterData(array $registrations = [])
+    {
+        $challenge = $this->createChallenge();
+        $request = new RegisterRequest($challenge, $this->appId);
+        $signs = $this->getAuthenticateData($registrations);
+        return [$request, $signs];
     }
 
-    if (!is_bool($includeCert)) {
-      throw new \InvalidArgumentException('$include_cert of doRegister() method only accepts boolean.');
-    }
+    /**
+     * Called to verify and unpack a registration message.
+     *
+     * @param RegisterRequest $request this is a reply to
+     * @param object $response response from a user
+     * @param bool $includeCert set to true if the attestation certificate should be
+     * included in the returned Registration object
+     * @return Registration
+     * @throws Error
+     */
+    public function doRegister($request, $response, $includeCert = true)
+    {
+        if (!is_object($request)) {
+            throw new \InvalidArgumentException('$request of doRegister() method only accepts object.');
+        }
 
-    $rawReg = $this->base64u_decode($response->registrationData);
-    $regData = array_values(unpack('C*', $rawReg));
-    $clientData = $this->base64u_decode($response->clientData);
-    $cli = json_decode($clientData);
+        if (!is_object($response)) {
+            throw new \InvalidArgumentException('$response of doRegister() method only accepts object.');
+        }
 
-    if ($cli->challenge !== $request->challenge) {
-      throw new Error('Registration challenge does not match', ERR_UNMATCHED_CHALLENGE );
-    }
+        if (property_exists($response, 'errorCode') && $response->errorCode !== 0) {
+            throw new Error('User-agent returned error. Error code: ' . $response->errorCode, ERR_BAD_UA_RETURNING);
+        }
 
-    $registration = new Registration();
-    $offs = 1;
-    $pubKey = substr($rawReg, $offs, PUBKEY_LEN);
-    $offs += PUBKEY_LEN;
-    // decode the pubKey to make sure it's good
-    $tmpKey = $this->pubkey_to_pem($pubKey);
-    if ($tmpKey === null) {
-      throw new Error('Decoding of public key failed', ERR_PUBKEY_DECODE );
-    }
-    $registration->publicKey = base64_encode($pubKey);
-    $khLen = $regData[$offs++];
-    $kh = substr($rawReg, $offs, $khLen);
-    $offs += $khLen;
-    $registration->keyHandle = $this->base64u_encode($kh);
-
-    // length of certificate is stored in byte 3 and 4 (excluding the first 4 bytes)
-    $certLen = 4;
-    $certLen += ($regData[$offs + 2] << 8);
-    $certLen += $regData[$offs + 3];
-
-    $rawCert = $this->fixSignatureUnusedBits(substr($rawReg, $offs, $certLen));
-    $offs += $certLen;
-    $pemCert  = "-----BEGIN CERTIFICATE-----\r\n";
-    $pemCert .= chunk_split(base64_encode($rawCert), 64);
-    $pemCert .= "-----END CERTIFICATE-----";
-    if ($includeCert) {
-      $registration->certificate = base64_encode($rawCert);
-    }
-    if ($this->attestDir) {
-      if (openssl_x509_checkpurpose($pemCert, -1, $this->get_certs()) !== true) {
-        throw new Error('Attestation certificate can not be validated', ERR_ATTESTATION_VERIFICATION );
-      }
-    }
+        if (!is_bool($includeCert)) {
+            throw new \InvalidArgumentException('$include_cert of doRegister() method only accepts boolean.');
+        }
 
-    if (!openssl_pkey_get_public($pemCert)) {
-      throw new Error('Decoding of public key failed', ERR_PUBKEY_DECODE );
-    }
-    $signature = substr($rawReg, $offs);
-
-    $dataToVerify  = chr(0);
-    $dataToVerify .= hash('sha256', $request->appId, true);
-    $dataToVerify .= hash('sha256', $clientData, true);
-    $dataToVerify .= $kh;
-    $dataToVerify .= $pubKey;
-
-    if (openssl_verify($dataToVerify, $signature, $pemCert, 'sha256') === 1) {
-      return $registration;
-    } else {
-      throw new Error('Attestation signature does not match', ERR_ATTESTATION_SIGNATURE );
-    }
-  }
-
-  /**
-   * Called to get an authentication request.
-   *
-   * @param array $registrations An array of the registrations to create authentication requests for.
-   * @return array An array of SignRequest
-   * @throws Error
-   */
-  public function getAuthenticateData(array $registrations) {
-    $sigs = array();
-    $challenge = $this->createChallenge();
-    foreach ($registrations as $reg) {
-      if (!is_object($reg)) {
-        throw new \InvalidArgumentException('$registrations of getAuthenticateData() method only accepts array of object.');
-      }
-
-      $sig = new SignRequest();
-      $sig->appId = $this->appId;
-      $sig->keyHandle = $reg->keyHandle;
-      $sig->challenge = $challenge;
-      $sigs[] = $sig;
-    }
-    return $sigs;
-  }
-
-  /**
-   * Called to verify an authentication response
-   *
-   * @param array $requests An array of outstanding authentication requests
-   * @param array $registrations An array of current registrations
-   * @param object $response A response from the authenticator
-   * @return Registration
-   * @throws Error
-   *
-   * The Registration object returned on success contains an updated counter
-   * that should be saved for future authentications.
-   * If the Error returned is ERR_COUNTER_TOO_LOW this is an indication of
-   * token cloning or similar and appropriate action should be taken.
-   */
-  public function doAuthenticate(array $requests, array $registrations, $response) {
-    if (!is_object($response)) {
-      throw new \InvalidArgumentException('$response of doAuthenticate() method only accepts object.');
+        $rawReg = $this->base64u_decode($response->registrationData);
+        $regData = array_values(unpack('C*', $rawReg));
+        $clientData = $this->base64u_decode($response->clientData);
+        $cli = json_decode($clientData);
+
+        if ($cli->challenge !== $request->challenge) {
+            throw new Error('Registration challenge does not match', ERR_UNMATCHED_CHALLENGE);
+        }
+
+        $registration = new Registration();
+        $offs = 1;
+        $pubKey = substr($rawReg, $offs, PUBKEY_LEN);
+        $offs += PUBKEY_LEN;
+        // decode the pubKey to make sure it's good
+        $tmpKey = $this->pubkey_to_pem($pubKey);
+        if ($tmpKey === null) {
+            throw new Error('Decoding of public key failed', ERR_PUBKEY_DECODE);
+        }
+        $registration->publicKey = base64_encode($pubKey);
+        $khLen = $regData[$offs++];
+        $kh = substr($rawReg, $offs, $khLen);
+        $offs += $khLen;
+        $registration->keyHandle = $this->base64u_encode($kh);
+
+        // length of certificate is stored in byte 3 and 4 (excluding the first 4 bytes)
+        $certLen = 4;
+        $certLen += ($regData[$offs + 2] << 8);
+        $certLen += $regData[$offs + 3];
+
+        $rawCert = $this->fixSignatureUnusedBits(substr($rawReg, $offs, $certLen));
+        $offs += $certLen;
+        $pemCert  = "-----BEGIN CERTIFICATE-----\r\n";
+        $pemCert .= chunk_split(base64_encode($rawCert), 64);
+        $pemCert .= "-----END CERTIFICATE-----";
+        if ($includeCert) {
+            $registration->certificate = base64_encode($rawCert);
+        }
+        if ($this->attestDir) {
+            if (openssl_x509_checkpurpose($pemCert, -1, $this->get_certs()) !== true) {
+                throw new Error('Attestation certificate can not be validated', ERR_ATTESTATION_VERIFICATION);
+            }
+        }
+
+        if (!openssl_pkey_get_public($pemCert)) {
+            throw new Error('Decoding of public key failed', ERR_PUBKEY_DECODE);
+        }
+        $signature = substr($rawReg, $offs);
+
+        $dataToVerify  = chr(0);
+        $dataToVerify .= hash('sha256', $request->appId, true);
+        $dataToVerify .= hash('sha256', $clientData, true);
+        $dataToVerify .= $kh;
+        $dataToVerify .= $pubKey;
+
+        if (openssl_verify($dataToVerify, $signature, $pemCert, 'sha256') === 1) {
+            return $registration;
+        } else {
+            throw new Error('Attestation signature does not match', ERR_ATTESTATION_SIGNATURE);
+        }
     }
 
-    if (property_exists($response, 'errorCode') && $response->errorCode !== 0) {
-      throw new Error('User-agent returned error. Error code: ' . $response->errorCode, ERR_BAD_UA_RETURNING );
+    /**
+     * Called to get an authentication request.
+     *
+     * @param array $registrations An array of the registrations to create authentication requests for.
+     * @return array An array of SignRequest
+     * @throws Error
+     */
+    public function getAuthenticateData(array $registrations)
+    {
+        $sigs = array();
+        $challenge = $this->createChallenge();
+        foreach ($registrations as $reg) {
+            if (!is_object($reg)) {
+                throw new \InvalidArgumentException('$registrations of getAuthenticateData() method only accepts array of object.');
+            }
+
+            $sig = new SignRequest();
+            $sig->appId = $this->appId;
+            $sig->keyHandle = $reg->keyHandle;
+            $sig->challenge = $challenge;
+            $sigs[] = $sig;
+        }
+        return $sigs;
     }
 
-    $req = null;
-    $reg = null;
+    /**
+     * Called to verify an authentication response
+     *
+     * @param array $requests An array of outstanding authentication requests
+     * @param array $registrations An array of current registrations
+     * @param object $response A response from the authenticator
+     * @return Registration
+     * @throws Error
+     *
+     * The Registration object returned on success contains an updated counter
+     * that should be saved for future authentications.
+     * If the Error returned is ERR_COUNTER_TOO_LOW this is an indication of
+     * token cloning or similar and appropriate action should be taken.
+     */
+    public function doAuthenticate(array $requests, array $registrations, $response)
+    {
+        if (!is_object($response)) {
+            throw new \InvalidArgumentException('$response of doAuthenticate() method only accepts object.');
+        }
+
+        if (property_exists($response, 'errorCode') && $response->errorCode !== 0) {
+            throw new Error('User-agent returned error. Error code: ' . $response->errorCode, ERR_BAD_UA_RETURNING);
+        }
 
-    $clientData = $this->base64u_decode($response->clientData);
-    $decodedClient = json_decode($clientData);
-    foreach ($requests as $req) {
-      if (!is_object($req)) {
-        throw new \InvalidArgumentException('$requests of doAuthenticate() method only accepts array of object.');
-      }
+        $req = null;
+        $reg = null;
 
-      if ($req->keyHandle === $response->keyHandle && $req->challenge === $decodedClient->challenge) {
-        break;
-      }
+        $clientData = $this->base64u_decode($response->clientData);
+        $decodedClient = json_decode($clientData);
+        foreach ($requests as $req) {
+            if (!is_object($req)) {
+                throw new \InvalidArgumentException('$requests of doAuthenticate() method only accepts array of object.');
+            }
 
-      $req = null;
-    }
-    if ($req === null) {
-      throw new Error('No matching request found', ERR_NO_MATCHING_REQUEST );
-    }
-    foreach ($registrations as $reg) {
-      if (!is_object($reg)) {
-        throw new \InvalidArgumentException('$registrations of doAuthenticate() method only accepts array of object.');
-      }
-
-      if ($reg->keyHandle === $response->keyHandle) {
-        break;
-      }
-      $reg = null;
+            if ($req->keyHandle === $response->keyHandle && $req->challenge === $decodedClient->challenge) {
+                break;
+            }
+
+            $req = null;
+        }
+        if ($req === null) {
+            throw new Error('No matching request found', ERR_NO_MATCHING_REQUEST);
+        }
+        foreach ($registrations as $reg) {
+            if (!is_object($reg)) {
+                throw new \InvalidArgumentException('$registrations of doAuthenticate() method only accepts array of object.');
+            }
+
+            if ($reg->keyHandle === $response->keyHandle) {
+                break;
+            }
+            $reg = null;
+        }
+        if ($reg === null) {
+            throw new Error('No matching registration found', ERR_NO_MATCHING_REGISTRATION);
+        }
+        $pemKey = $this->pubkey_to_pem($this->base64u_decode($reg->publicKey));
+        if ($pemKey === null) {
+            throw new Error('Decoding of public key failed', ERR_PUBKEY_DECODE);
+        }
+
+        $signData = $this->base64u_decode($response->signatureData);
+        $dataToVerify  = hash('sha256', $req->appId, true);
+        $dataToVerify .= substr($signData, 0, 5);
+        $dataToVerify .= hash('sha256', $clientData, true);
+        $signature = substr($signData, 5);
+
+        if (openssl_verify($dataToVerify, $signature, $pemKey, 'sha256') === 1) {
+            $ctr = unpack("Nctr", substr($signData, 1, 4));
+            $counter = $ctr['ctr'];
+            /* TODO: wrap-around should be handled somehow.. */
+            if ($counter > $reg->counter) {
+                $reg->counter = $counter;
+                return $reg;
+            } else {
+                throw new Error('Counter too low.', ERR_COUNTER_TOO_LOW);
+            }
+        } else {
+            throw new Error('Authentication failed', ERR_AUTHENTICATION_FAILURE);
+        }
     }
-    if ($reg === null) {
-      throw new Error('No matching registration found', ERR_NO_MATCHING_REGISTRATION );
+
+    /**
+     * @return array
+     */
+    private function get_certs()
+    {
+        $files = array();
+        $dir = $this->attestDir;
+        if ($dir && $handle = opendir($dir)) {
+            while (false !== ($entry = readdir($handle))) {
+                if (is_file("$dir/$entry")) {
+                    $files[] = "$dir/$entry";
+                }
+            }
+            closedir($handle);
+        }
+        return $files;
     }
-    $pemKey = $this->pubkey_to_pem($this->base64u_decode($reg->publicKey));
-    if ($pemKey === null) {
-      throw new Error('Decoding of public key failed', ERR_PUBKEY_DECODE );
+
+    /**
+     * @param string $data
+     * @return string
+     */
+    private function base64u_encode($data)
+    {
+        return trim(strtr(base64_encode($data), '+/', '-_'), '=');
     }
 
-    $signData = $this->base64u_decode($response->signatureData);
-    $dataToVerify  = hash('sha256', $req->appId, true);
-    $dataToVerify .= substr($signData, 0, 5);
-    $dataToVerify .= hash('sha256', $clientData, true);
-    $signature = substr($signData, 5);
-
-    if (openssl_verify($dataToVerify, $signature, $pemKey, 'sha256') === 1) {
-      $ctr = unpack("Nctr", substr($signData, 1, 4));
-      $counter = $ctr['ctr'];
-      /* TODO: wrap-around should be handled somehow.. */
-      if ($counter > $reg->counter) {
-        $reg->counter = $counter;
-        return $reg;
-      } else {
-        throw new Error('Counter too low.', ERR_COUNTER_TOO_LOW );
-      }
-    } else {
-      throw new Error('Authentication failed', ERR_AUTHENTICATION_FAILURE );
+    /**
+     * @param string $data
+     * @return string
+     */
+    private function base64u_decode($data)
+    {
+        return base64_decode(strtr($data, '-_', '+/'));
     }
-  }
-
-  /**
-   * @return array
-   */
-  private function get_certs() {
-    $files = array();
-    $dir = $this->attestDir;
-    if ($dir && $handle = opendir($dir)) {
-      while(false !== ($entry = readdir($handle))) {
-        if (is_file("$dir/$entry")) {
-          $files[] = "$dir/$entry";
+
+    /**
+     * @param string $key
+     * @return null|string
+     */
+    private function pubkey_to_pem($key)
+    {
+        if (strlen($key) !== PUBKEY_LEN || $key[0] !== "\x04") {
+            return null;
         }
-      }
-      closedir($handle);
-    }
-    return $files;
-  }
-
-  /**
-   * @param string $data
-   * @return string
-   */
-  private function base64u_encode($data) {
-    return trim(strtr(base64_encode($data), '+/', '-_'), '=');
-  }
-
-  /**
-   * @param string $data
-   * @return string
-   */
-  private function base64u_decode($data) {
-    return base64_decode(strtr($data, '-_', '+/'));
-  }
-
-  /**
-   * @param string $key
-   * @return null|string
-   */
-  private function pubkey_to_pem($key) {
-    if (strlen($key) !== PUBKEY_LEN || $key[0] !== "\x04") {
-      return null;
+
+        /*
+         * Convert the public key to binary DER format first
+         * Using the ECC SubjectPublicKeyInfo OIDs from RFC 5480
+         *
+         *  SEQUENCE(2 elem)                        30 59
+         *   SEQUENCE(2 elem)                       30 13
+         *    OID1.2.840.10045.2.1 (id-ecPublicKey) 06 07 2a 86 48 ce 3d 02 01
+         *    OID1.2.840.10045.3.1.7 (secp256r1)    06 08 2a 86 48 ce 3d 03 01 07
+         *   BIT STRING(520 bit)                    03 42 ..key..
+         */
+        $der  = "\x30\x59\x30\x13\x06\x07\x2a\x86\x48\xce\x3d\x02\x01";
+        $der .= "\x06\x08\x2a\x86\x48\xce\x3d\x03\x01\x07\x03\x42";
+        $der .= "\0".$key;
+
+        $pem  = "-----BEGIN PUBLIC KEY-----\r\n";
+        $pem .= chunk_split(base64_encode($der), 64);
+        $pem .= "-----END PUBLIC KEY-----";
+
+        return $pem;
     }
 
-    /*
-     * Convert the public key to binary DER format first
-     * Using the ECC SubjectPublicKeyInfo OIDs from RFC 5480
-     *
-     *  SEQUENCE(2 elem)                        30 59
-     *   SEQUENCE(2 elem)                       30 13
-     *    OID1.2.840.10045.2.1 (id-ecPublicKey) 06 07 2a 86 48 ce 3d 02 01
-     *    OID1.2.840.10045.3.1.7 (secp256r1)    06 08 2a 86 48 ce 3d 03 01 07
-     *   BIT STRING(520 bit)                    03 42 ..key..
+    /**
+     * @return string
+     * @throws Error
      */
-    $der  = "\x30\x59\x30\x13\x06\x07\x2a\x86\x48\xce\x3d\x02\x01";
-    $der .= "\x06\x08\x2a\x86\x48\xce\x3d\x03\x01\x07\x03\x42";
-    $der .= "\0".$key;
-
-    $pem  = "-----BEGIN PUBLIC KEY-----\r\n";
-    $pem .= chunk_split(base64_encode($der), 64);
-    $pem .= "-----END PUBLIC KEY-----";
-
-    return $pem;
-  }
-
-  /**
-   * @return string
-   * @throws Error
-   */
-  private function createChallenge() {
-    $challenge = openssl_random_pseudo_bytes(32, $crypto_strong );
-    if ($crypto_strong !== true) {
-      throw new Error('Unable to obtain a good source of randomness', ERR_BAD_RANDOM);
-    }
+    private function createChallenge()
+    {
+        $challenge = openssl_random_pseudo_bytes(32, $crypto_strong);
+        if ($crypto_strong !== true) {
+            throw new Error('Unable to obtain a good source of randomness', ERR_BAD_RANDOM);
+        }
 
-    $challenge = $this->base64u_encode( $challenge );
+        $challenge = $this->base64u_encode($challenge);
 
-    return $challenge;
-  }
+        return $challenge;
+    }
 
-  /**
-   * Fixes a certificate where the signature contains unused bits.
-   *
-   * @param string $cert
-   * @return mixed
-   */
-  private function fixSignatureUnusedBits($cert) {
-    if (in_array(hash('sha256', $cert), $this->FIXCERTS)) {
-      $cert[strlen($cert) - 257] = "\0";
+    /**
+     * Fixes a certificate where the signature contains unused bits.
+     *
+     * @param string $cert
+     * @return mixed
+     */
+    private function fixSignatureUnusedBits($cert)
+    {
+        if (in_array(hash('sha256', $cert), $this->FIXCERTS)) {
+            $cert[strlen($cert) - 257] = "\0";
+        }
+        return $cert;
     }
-    return $cert;
-  }
 }
 
 /**
@@ -408,22 +420,24 @@ class U2F {
  *
  * @package u2flib_server
  */
-class RegisterRequest {
-  public $version = U2F_VERSION;
-
-  public $challenge;
-
-  public $appId;
-
-  /**
-   * @param string $challenge
-   * @param string $appId
-   * @internal
-   */
-  public function __construct($challenge, $appId) {
-    $this->challenge = $challenge;
-    $this->appId = $appId;
-  }
+class RegisterRequest
+{
+    public $version = U2F_VERSION;
+
+    public $challenge;
+
+    public $appId;
+
+    /**
+     * @param string $challenge
+     * @param string $appId
+     * @internal
+     */
+    public function __construct($challenge, $appId)
+    {
+        $this->challenge = $challenge;
+        $this->appId = $appId;
+    }
 }
 
 /**
@@ -431,14 +445,15 @@ class RegisterRequest {
  *
  * @package u2flib_server
  */
-class SignRequest {
-  public $version = U2F_VERSION;
+class SignRequest
+{
+    public $version = U2F_VERSION;
 
-  public $challenge;
+    public $challenge;
 
-  public $keyHandle;
+    public $keyHandle;
 
-  public $appId;
+    public $appId;
 }
 
 /**
@@ -446,14 +461,15 @@ class SignRequest {
  *
  * @package u2flib_server
  */
-class Registration {
-  public $keyHandle;
+class Registration
+{
+    public $keyHandle;
 
-  public $publicKey;
+    public $publicKey;
 
-  public $certificate;
+    public $certificate;
 
-  public $counter = -1;
+    public $counter = -1;
 }
 
 /**
@@ -461,14 +477,16 @@ class Registration {
  *
  * @package u2flib_server
  */
-class Error extends \Exception {
-  /**
-   * Override constructor and make message and code mandatory
-   * @param string $message
-   * @param int $code
-   * @param \Exception|null $previous
-   */
-  public function __construct($message, $code, \Exception $previous = null) {
-    parent::__construct($message, $code, $previous);
-  }
+class Error extends \Exception
+{
+    /**
+     * Override constructor and make message and code mandatory
+     * @param string $message
+     * @param int $code
+     * @param \Exception|null $previous
+     */
+    public function __construct($message, $code, \Exception $previous = null)
+    {
+        parent::__construct($message, $code, $previous);
+    }
 }

classes/useragent.class.php

@@ -1,6 +1,7 @@
-<?
-class UserAgent {
-  private static $Browsers = array(
+<?php
+class UserAgent
+{
+    private static $Browsers = array(
     //Less popular
     'Shiira'     => 'Shiira',
     'Songbird'   => 'Songbird',
@@ -43,9 +44,9 @@ class UserAgent {
     'Java'          => 'Java',
     'RSS'           => 'RSS Downloader'
     */
-  );
+    );
 
-  private static $OperatingSystems = array(
+    private static $OperatingSystems = array(
     //Mobile
     'SymbianOS'    => 'Symbian',
     'blackberry'   => 'BlackBerry',
@@ -115,46 +116,49 @@ class UserAgent {
     //Catch-all
     'win' => 'Windows',
     'mac' => 'Mac OS X'
-  );
+    );
 
-  public static function operating_system(&$UserAgentString) {
-    if (empty($UserAgentString)) {
-      return 'Hidden';
+    public static function operating_system(&$UserAgentString)
+    {
+        if (empty($UserAgentString)) {
+            return 'Hidden';
+        }
+        foreach (self::$OperatingSystems as $String => $OperatingSystem) {
+            if (stripos($UserAgentString, $String) !== false) {
+                return $OperatingSystem;
+            }
+        }
+        return 'Unknown';
     }
-    foreach (self::$OperatingSystems as $String => $OperatingSystem) {
-      if (stripos($UserAgentString, $String) !== false) {
-        return $OperatingSystem;
-      }
-    }
-    return 'Unknown';
-  }
 
-  public static function mobile(&$UserAgentString) {
-    if (strpos($UserAgentString, 'iPad') !== false) {
-      return false;
-    }
+    public static function mobile(&$UserAgentString)
+    {
+        if (strpos($UserAgentString, 'iPad') !== false) {
+            return false;
+        }
 
-    // "Mobi" catches "Mobile" too
-    if (strpos($UserAgentString, 'Device') || strpos($UserAgentString, 'Mobi') || strpos($UserAgentString, 'Mini') || strpos($UserAgentString, 'webOS')) {
-      return true;
+        // "Mobi" catches "Mobile" too
+        if (strpos($UserAgentString, 'Device') || strpos($UserAgentString, 'Mobi') || strpos($UserAgentString, 'Mini') || strpos($UserAgentString, 'webOS')) {
+            return true;
+        }
+        return false;
     }
-    return false;
-  }
 
-  public static function browser(&$UserAgentString) {
-    if (empty($UserAgentString)) {
-      return 'Hidden';
-    }
-    $Return = 'Unknown';
-    foreach (self::$Browsers as $String => $Browser) {
-      if (strpos($UserAgentString, $String) !== false) {
-        $Return = $Browser;
-        break;
-      }
-    }
-    if (self::mobile($UserAgentString)) {
-      $Return .= ' Mobile';
+    public static function browser(&$UserAgentString)
+    {
+        if (empty($UserAgentString)) {
+            return 'Hidden';
+        }
+        $Return = 'Unknown';
+        foreach (self::$Browsers as $String => $Browser) {
+            if (strpos($UserAgentString, $String) !== false) {
+                $Return = $Browser;
+                break;
+            }
+        }
+        if (self::mobile($UserAgentString)) {
+            $Return .= ' Mobile';
+        }
+        return $Return;
     }
-    return $Return;
-  }
 }