From 2652936c164a8da9ba558b83ee85eb65427e4b39 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Wed, 13 Nov 2019 12:22:38 +0100
Subject: [PATCH] core/tests: adapt device_emu_fido2/u2f to reordered usb
 endpoints

---
 core/tests/run_tests_device_emu_fido2.sh | 1 +
 core/tests/run_tests_device_emu_u2f.sh   | 5 +++--
 vendor/fido2-tests                       | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/tests/run_tests_device_emu_fido2.sh b/core/tests/run_tests_device_emu_fido2.sh
index bad434d9bc..dca6996b5b 100755
--- a/core/tests/run_tests_device_emu_fido2.sh
+++ b/core/tests/run_tests_device_emu_fido2.sh
@@ -32,6 +32,7 @@ fi
 cd ../../tests/fido_tests/fido2
 # run tests
 error=0
+export TREZOR_FIDO2_UDP_PORT=21326
 if ! pytest --random-order-seed=414020 --sim tests/standard/ --vendor trezor "$@"; then  # hardcoded order seed, which succeeds
   error=1
 fi
diff --git a/core/tests/run_tests_device_emu_u2f.sh b/core/tests/run_tests_device_emu_u2f.sh
index 6f6a4efc02..5902a6c4d3 100755
--- a/core/tests/run_tests_device_emu_u2f.sh
+++ b/core/tests/run_tests_device_emu_u2f.sh
@@ -31,14 +31,15 @@ fi
 
 # run tests
 error=0
+TREZOR_FIDO2_UDP_PORT=21326
 # missuse loaddevice test to initialize the device
 if ! pytest ../../tests/device_tests -k "test_msg_loaddevice" "$@"; then
   error=1
 fi
-if ! ../../tests/fido_tests/u2f-tests-hid/HIDTest 21328 "$@"; then
+if ! ../../tests/fido_tests/u2f-tests-hid/HIDTest "${TREZOR_FIDO2_UDP_PORT}" "$@"; then
   error=1
 fi
-if ! ../../tests/fido_tests/u2f-tests-hid/U2FTest 21328 "$@"; then
+if ! ../../tests/fido_tests/u2f-tests-hid/U2FTest "${TREZOR_FIDO2_UDP_PORT}" "$@"; then
   error=1
 fi
 kill $upy_pid
diff --git a/vendor/fido2-tests b/vendor/fido2-tests
index f414dd2bc1..e1e44d4389 160000
--- a/vendor/fido2-tests
+++ b/vendor/fido2-tests
@@ -1 +1 @@
-Subproject commit f414dd2bc1094f148b217ed58516ccbf4cf43690
+Subproject commit e1e44d43893fd8eefde4f18f576d006747e5fc90