Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Čihař <michal@cihar.com>2017-10-31 18:12:51 +0300
committerMichal Čihař <michal@cihar.com>2017-11-01 18:34:31 +0300
commit540b78dc2ed78e77a6d7c33852a29297a758b3c2 (patch)
tree0cae4886356fe56041a61d25b9881d2b23371b3c /composer.json
parent047a6ac3f7ee53f9ff2324a60bd5a6678474aa32 (diff)
Add support for FIDO U2F authentication
Signed-off-by: Michal Čihař <michal@cihar.com>
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json6
1 files changed, 4 insertions, 2 deletions
diff --git a/composer.json b/composer.json
index 3e49d49291..1372c79eab 100644
--- a/composer.json
+++ b/composer.json
@@ -59,7 +59,8 @@
"conflict": {
"tecnickcom/tcpdf": "<6.2",
"pragmarx/google2fa": "<2.0",
- "bacon/bacon-qr-code": "<1.0"
+ "bacon/bacon-qr-code": "<1.0",
+ "samyoul/u2f-php-server": "<1.1"
},
"suggest": {
"ext-openssl": "Cookie encryption",
@@ -72,7 +73,8 @@
"ext-mbstring": "For best performance",
"tecnickcom/tcpdf": "For PDF support",
"pragmarx/google2fa": "For 2FA authentication",
- "bacon/bacon-qr-code": "For 2FA authentication"
+ "bacon/bacon-qr-code": "For 2FA authentication",
+ "samyoul/u2f-php-server": "For FIDO U2F authentication"
},
"require-dev": {
"phpunit/phpunit": "~4.1",