diff options
author | Christoph Wurst <christoph@winzerhof-wurst.at> | 2017-05-09 10:42:04 +0300 |
---|---|---|
committer | Christoph Wurst <christoph@winzerhof-wurst.at> | 2017-05-09 10:42:04 +0300 |
commit | d59ab69257c49782ca599296fc5b4f96198cd537 (patch) | |
tree | db67088f4e7dd4d6ba6d2512e042846fccfed516 /vendor | |
parent | 3804f5b8ea7db9681c7d7aee501681342901aac6 (diff) |
Update u2f lib to 1.0.1
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'vendor')
-rw-r--r-- | vendor/composer/ClassLoader.php | 10 | ||||
-rw-r--r-- | vendor/composer/LICENSE | 2 | ||||
-rw-r--r-- | vendor/composer/installed.json | 18 | ||||
-rw-r--r-- | vendor/yubico/u2flib-server/.travis.yml | 18 | ||||
-rw-r--r-- | vendor/yubico/u2flib-server/NEWS | 4 | ||||
-rw-r--r-- | vendor/yubico/u2flib-server/apigen.neon | 3 | ||||
-rw-r--r-- | vendor/yubico/u2flib-server/composer.json | 7 | ||||
-rw-r--r-- | vendor/yubico/u2flib-server/phpunit.xml | 2 | ||||
-rw-r--r-- | vendor/yubico/u2flib-server/src/u2flib_server/U2F.php | 3 |
9 files changed, 43 insertions, 24 deletions
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php index 4626994..2c72175 100644 --- a/vendor/composer/ClassLoader.php +++ b/vendor/composer/ClassLoader.php @@ -374,9 +374,13 @@ class ClassLoader $first = $class[0]; if (isset($this->prefixLengthsPsr4[$first])) { - foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) { - if (0 === strpos($class, $prefix)) { - foreach ($this->prefixDirsPsr4[$prefix] as $dir) { + $subPath = $class; + while (false !== $lastPos = strrpos($subPath, '\\')) { + $subPath = substr($subPath, 0, $lastPos); + $search = $subPath.'\\'; + if (isset($this->prefixDirsPsr4[$search])) { + foreach ($this->prefixDirsPsr4[$search] as $dir) { + $length = $this->prefixLengthsPsr4[$first][$search]; if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) { return $file; } diff --git a/vendor/composer/LICENSE b/vendor/composer/LICENSE index 1a28124..f27399a 100644 --- a/vendor/composer/LICENSE +++ b/vendor/composer/LICENSE @@ -1,5 +1,5 @@ -Copyright (c) 2016 Nils Adermann, Jordi Boggiano +Copyright (c) Nils Adermann, Jordi Boggiano Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 1e04261..a75cb03 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -1,23 +1,27 @@ [ { "name": "yubico/u2flib-server", - "version": "1.0.0", - "version_normalized": "1.0.0.0", + "version": "1.0.1", + "version_normalized": "1.0.1.0", "source": { "type": "git", "url": "https://github.com/Yubico/php-u2flib-server.git", - "reference": "407eb21da24150aad30bcd8cc0ee72963eac5e9d" + "reference": "dc318c80b59e62921c210f31b014def26ceebbab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Yubico/php-u2flib-server/zipball/407eb21da24150aad30bcd8cc0ee72963eac5e9d", - "reference": "407eb21da24150aad30bcd8cc0ee72963eac5e9d", + "url": "https://api.github.com/repos/Yubico/php-u2flib-server/zipball/dc318c80b59e62921c210f31b014def26ceebbab", + "reference": "dc318c80b59e62921c210f31b014def26ceebbab", "shasum": "" }, "require": { - "ext-openssl": "*" + "ext-openssl": "*", + "php": ">=5.6" }, - "time": "2016-02-19T09:47:51+00:00", + "require-dev": { + "phpunit/phpunit": "~5.7" + }, + "time": "2017-05-09T07:33:58+00:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/vendor/yubico/u2flib-server/.travis.yml b/vendor/yubico/u2flib-server/.travis.yml index 781f2b8..b4282b2 100644 --- a/vendor/yubico/u2flib-server/.travis.yml +++ b/vendor/yubico/u2flib-server/.travis.yml @@ -1,19 +1,21 @@ language: php sudo: false php: - - 5.3 - - 5.4 - - 5.5 - - 5.6 - 7.0 + - 7.1 - hhvm - - hhvm-nightly -after_success: - - test -z $COVERALLS || (composer require satooshi/php-coveralls && vendor/bin/coveralls -v) matrix: include: - php: 5.6 env: COVERALLS=true allow_failures: - php: hhvm - - php: hhvm-nightly + +before_script: + - composer install + +script: + - ./vendor/phpunit/phpunit/phpunit -c phpunit.xml + +after_success: + - test -z $COVERALLS || (composer require satooshi/php-coveralls && vendor/bin/coveralls -v) diff --git a/vendor/yubico/u2flib-server/NEWS b/vendor/yubico/u2flib-server/NEWS index 0fffd58..a8f97ae 100644 --- a/vendor/yubico/u2flib-server/NEWS +++ b/vendor/yubico/u2flib-server/NEWS @@ -1,5 +1,9 @@ php-u2flib-server NEWS -- History of user-visible changes. +* Version 1.0.1 (released 2017-05-09) + ** Move examples to phps so they don't execute by default + ** Use common challenge for multiple registrations + * Version 1.0.0 (released 2016-02-19) ** Give an early error on openssl < 1.0 ** Support devices with initial counter 0 diff --git a/vendor/yubico/u2flib-server/apigen.neon b/vendor/yubico/u2flib-server/apigen.neon index 80d9e74..bbb7071 100644 --- a/vendor/yubico/u2flib-server/apigen.neon +++ b/vendor/yubico/u2flib-server/apigen.neon @@ -3,7 +3,8 @@ destination: apidocs source: - src/u2flib_server -exclude: "*/tests/*" +exclude: + - "*/tests/*" groups: none diff --git a/vendor/yubico/u2flib-server/composer.json b/vendor/yubico/u2flib-server/composer.json index f14a88f..5b3a970 100644 --- a/vendor/yubico/u2flib-server/composer.json +++ b/vendor/yubico/u2flib-server/composer.json @@ -4,10 +4,13 @@ "homepage":"https://developers.yubico.com/php-u2flib-server", "license":"BSD-2-Clause", "require": { - "ext-openssl":"*" + "ext-openssl":"*", + "php": ">=5.6" }, "autoload": { "classmap": ["src/"] + }, + "require-dev": { + "phpunit/phpunit": "~5.7" } } - diff --git a/vendor/yubico/u2flib-server/phpunit.xml b/vendor/yubico/u2flib-server/phpunit.xml index 603e693..fa6f08e 100644 --- a/vendor/yubico/u2flib-server/phpunit.xml +++ b/vendor/yubico/u2flib-server/phpunit.xml @@ -1,7 +1,7 @@ <phpunit colors="true"> <testsuite name="tests"> - <directory suffix="test.php">.</directory> + <directory suffix="test.php">tests</directory> </testsuite> <logging> <log type="coverage-clover" target="build/logs/clover.xml"/> diff --git a/vendor/yubico/u2flib-server/src/u2flib_server/U2F.php b/vendor/yubico/u2flib-server/src/u2flib_server/U2F.php index b79d7fa..a11c78f 100644 --- a/vendor/yubico/u2flib-server/src/u2flib_server/U2F.php +++ b/vendor/yubico/u2flib-server/src/u2flib_server/U2F.php @@ -222,6 +222,7 @@ class U2F 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.'); @@ -230,7 +231,7 @@ class U2F $sig = new SignRequest(); $sig->appId = $this->appId; $sig->keyHandle = $reg->keyHandle; - $sig->challenge = $this->createChallenge(); + $sig->challenge = $challenge; $sigs[] = $sig; } return $sigs; |