diff --git a/CHANGELOG.md b/CHANGELOG.md index c2dba91d..b1fc326d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,26 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [0.12.0] 2024-11-25 + +### Added + +- NFC communication available +- Starting Speculos with the `--transport` argument allows to choose U2F, HID or NFC transport +- Flex and Stax OSes emulation always consider NFC to be up (it can't be deactivated for now) + +### Changed + +- Update Python dependencies (certifi, urllib3, werkzeug, zipp, requests) + +## [0.11.0] 2024-11-12 + +### Added + +- Ledger PKI support (S+/X+Stax/Flex) +- API_LEVEL_22 support (S+/X+Stax/Flex) + ## [0.10.0] 2024-10-03 ### Added diff --git a/Pipfile.lock b/Pipfile.lock index 7a0ab371..8797b65a 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -41,107 +41,122 @@ }, "certifi": { "hashes": [ - "sha256:0569859f95fc761b18b45ef421b1290a0f65f147e92a1e5eb3e635f9a5e4e66f", - "sha256:dc383c07b76109f368f6106eee2b593b04a011ea4d55f652c6ca24a754d1cdd1" + "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8", + "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9" ], "markers": "python_version >= '3.6'", - "version": "==2024.2.2" + "version": "==2024.8.30" }, "charset-normalizer": { "hashes": [ - "sha256:06435b539f889b1f6f4ac1758871aae42dc3a8c0e24ac9e60c2384973ad73027", - "sha256:06a81e93cd441c56a9b65d8e1d043daeb97a3d0856d177d5c90ba85acb3db087", - "sha256:0a55554a2fa0d408816b3b5cedf0045f4b8e1a6065aec45849de2d6f3f8e9786", - "sha256:0b2b64d2bb6d3fb9112bafa732def486049e63de9618b5843bcdd081d8144cd8", - "sha256:10955842570876604d404661fbccbc9c7e684caf432c09c715ec38fbae45ae09", - "sha256:122c7fa62b130ed55f8f285bfd56d5f4b4a5b503609d181f9ad85e55c89f4185", - "sha256:1ceae2f17a9c33cb48e3263960dc5fc8005351ee19db217e9b1bb15d28c02574", - "sha256:1d3193f4a680c64b4b6a9115943538edb896edc190f0b222e73761716519268e", - "sha256:1f79682fbe303db92bc2b1136016a38a42e835d932bab5b3b1bfcfbf0640e519", - "sha256:2127566c664442652f024c837091890cb1942c30937add288223dc895793f898", - "sha256:22afcb9f253dac0696b5a4be4a1c0f8762f8239e21b99680099abd9b2b1b2269", - "sha256:25baf083bf6f6b341f4121c2f3c548875ee6f5339300e08be3f2b2ba1721cdd3", - "sha256:2e81c7b9c8979ce92ed306c249d46894776a909505d8f5a4ba55b14206e3222f", - "sha256:3287761bc4ee9e33561a7e058c72ac0938c4f57fe49a09eae428fd88aafe7bb6", - "sha256:34d1c8da1e78d2e001f363791c98a272bb734000fcef47a491c1e3b0505657a8", - "sha256:37e55c8e51c236f95b033f6fb391d7d7970ba5fe7ff453dad675e88cf303377a", - "sha256:3d47fa203a7bd9c5b6cee4736ee84ca03b8ef23193c0d1ca99b5089f72645c73", - "sha256:3e4d1f6587322d2788836a99c69062fbb091331ec940e02d12d179c1d53e25fc", - "sha256:42cb296636fcc8b0644486d15c12376cb9fa75443e00fb25de0b8602e64c1714", - "sha256:45485e01ff4d3630ec0d9617310448a8702f70e9c01906b0d0118bdf9d124cf2", - "sha256:4a78b2b446bd7c934f5dcedc588903fb2f5eec172f3d29e52a9096a43722adfc", - "sha256:4ab2fe47fae9e0f9dee8c04187ce5d09f48eabe611be8259444906793ab7cbce", - "sha256:4d0d1650369165a14e14e1e47b372cfcb31d6ab44e6e33cb2d4e57265290044d", - "sha256:549a3a73da901d5bc3ce8d24e0600d1fa85524c10287f6004fbab87672bf3e1e", - "sha256:55086ee1064215781fff39a1af09518bc9255b50d6333f2e4c74ca09fac6a8f6", - "sha256:572c3763a264ba47b3cf708a44ce965d98555f618ca42c926a9c1616d8f34269", - "sha256:573f6eac48f4769d667c4442081b1794f52919e7edada77495aaed9236d13a96", - "sha256:5b4c145409bef602a690e7cfad0a15a55c13320ff7a3ad7ca59c13bb8ba4d45d", - "sha256:6463effa3186ea09411d50efc7d85360b38d5f09b870c48e4600f63af490e56a", - "sha256:65f6f63034100ead094b8744b3b97965785388f308a64cf8d7c34f2f2e5be0c4", - "sha256:663946639d296df6a2bb2aa51b60a2454ca1cb29835324c640dafb5ff2131a77", - "sha256:6897af51655e3691ff853668779c7bad41579facacf5fd7253b0133308cf000d", - "sha256:68d1f8a9e9e37c1223b656399be5d6b448dea850bed7d0f87a8311f1ff3dabb0", - "sha256:6ac7ffc7ad6d040517be39eb591cac5ff87416c2537df6ba3cba3bae290c0fed", - "sha256:6b3251890fff30ee142c44144871185dbe13b11bab478a88887a639655be1068", - "sha256:6c4caeef8fa63d06bd437cd4bdcf3ffefe6738fb1b25951440d80dc7df8c03ac", - "sha256:6ef1d82a3af9d3eecdba2321dc1b3c238245d890843e040e41e470ffa64c3e25", - "sha256:753f10e867343b4511128c6ed8c82f7bec3bd026875576dfd88483c5c73b2fd8", - "sha256:7cd13a2e3ddeed6913a65e66e94b51d80a041145a026c27e6bb76c31a853c6ab", - "sha256:7ed9e526742851e8d5cc9e6cf41427dfc6068d4f5a3bb03659444b4cabf6bc26", - "sha256:7f04c839ed0b6b98b1a7501a002144b76c18fb1c1850c8b98d458ac269e26ed2", - "sha256:802fe99cca7457642125a8a88a084cef28ff0cf9407060f7b93dca5aa25480db", - "sha256:80402cd6ee291dcb72644d6eac93785fe2c8b9cb30893c1af5b8fdd753b9d40f", - "sha256:8465322196c8b4d7ab6d1e049e4c5cb460d0394da4a27d23cc242fbf0034b6b5", - "sha256:86216b5cee4b06df986d214f664305142d9c76df9b6512be2738aa72a2048f99", - "sha256:87d1351268731db79e0f8e745d92493ee2841c974128ef629dc518b937d9194c", - "sha256:8bdb58ff7ba23002a4c5808d608e4e6c687175724f54a5dade5fa8c67b604e4d", - "sha256:8c622a5fe39a48f78944a87d4fb8a53ee07344641b0562c540d840748571b811", - "sha256:8d756e44e94489e49571086ef83b2bb8ce311e730092d2c34ca8f7d925cb20aa", - "sha256:8f4a014bc36d3c57402e2977dada34f9c12300af536839dc38c0beab8878f38a", - "sha256:9063e24fdb1e498ab71cb7419e24622516c4a04476b17a2dab57e8baa30d6e03", - "sha256:90d558489962fd4918143277a773316e56c72da56ec7aa3dc3dbbe20fdfed15b", - "sha256:923c0c831b7cfcb071580d3f46c4baf50f174be571576556269530f4bbd79d04", - "sha256:95f2a5796329323b8f0512e09dbb7a1860c46a39da62ecb2324f116fa8fdc85c", - "sha256:96b02a3dc4381e5494fad39be677abcb5e6634bf7b4fa83a6dd3112607547001", - "sha256:9f96df6923e21816da7e0ad3fd47dd8f94b2a5ce594e00677c0013018b813458", - "sha256:a10af20b82360ab00827f916a6058451b723b4e65030c5a18577c8b2de5b3389", - "sha256:a50aebfa173e157099939b17f18600f72f84eed3049e743b68ad15bd69b6bf99", - "sha256:a981a536974bbc7a512cf44ed14938cf01030a99e9b3a06dd59578882f06f985", - "sha256:a9a8e9031d613fd2009c182b69c7b2c1ef8239a0efb1df3f7c8da66d5dd3d537", - "sha256:ae5f4161f18c61806f411a13b0310bea87f987c7d2ecdbdaad0e94eb2e404238", - "sha256:aed38f6e4fb3f5d6bf81bfa990a07806be9d83cf7bacef998ab1a9bd660a581f", - "sha256:b01b88d45a6fcb69667cd6d2f7a9aeb4bf53760d7fc536bf679ec94fe9f3ff3d", - "sha256:b261ccdec7821281dade748d088bb6e9b69e6d15b30652b74cbbac25e280b796", - "sha256:b2b0a0c0517616b6869869f8c581d4eb2dd83a4d79e0ebcb7d373ef9956aeb0a", - "sha256:b4a23f61ce87adf89be746c8a8974fe1c823c891d8f86eb218bb957c924bb143", - "sha256:bd8f7df7d12c2db9fab40bdd87a7c09b1530128315d047a086fa3ae3435cb3a8", - "sha256:beb58fe5cdb101e3a055192ac291b7a21e3b7ef4f67fa1d74e331a7f2124341c", - "sha256:c002b4ffc0be611f0d9da932eb0f704fe2602a9a949d1f738e4c34c75b0863d5", - "sha256:c083af607d2515612056a31f0a8d9e0fcb5876b7bfc0abad3ecd275bc4ebc2d5", - "sha256:c180f51afb394e165eafe4ac2936a14bee3eb10debc9d9e4db8958fe36afe711", - "sha256:c235ebd9baae02f1b77bcea61bce332cb4331dc3617d254df3323aa01ab47bd4", - "sha256:cd70574b12bb8a4d2aaa0094515df2463cb429d8536cfb6c7ce983246983e5a6", - "sha256:d0eccceffcb53201b5bfebb52600a5fb483a20b61da9dbc885f8b103cbe7598c", - "sha256:d965bba47ddeec8cd560687584e88cf699fd28f192ceb452d1d7ee807c5597b7", - "sha256:db364eca23f876da6f9e16c9da0df51aa4f104a972735574842618b8c6d999d4", - "sha256:ddbb2551d7e0102e7252db79ba445cdab71b26640817ab1e3e3648dad515003b", - "sha256:deb6be0ac38ece9ba87dea880e438f25ca3eddfac8b002a2ec3d9183a454e8ae", - "sha256:e06ed3eb3218bc64786f7db41917d4e686cc4856944f53d5bdf83a6884432e12", - "sha256:e27ad930a842b4c5eb8ac0016b0a54f5aebbe679340c26101df33424142c143c", - "sha256:e537484df0d8f426ce2afb2d0f8e1c3d0b114b83f8850e5f2fbea0e797bd82ae", - "sha256:eb00ed941194665c332bf8e078baf037d6c35d7c4f3102ea2d4f16ca94a26dc8", - "sha256:eb6904c354526e758fda7167b33005998fb68c46fbc10e013ca97f21ca5c8887", - "sha256:eb8821e09e916165e160797a6c17edda0679379a4be5c716c260e836e122f54b", - "sha256:efcb3f6676480691518c177e3b465bcddf57cea040302f9f4e6e191af91174d4", - "sha256:f27273b60488abe721a075bcca6d7f3964f9f6f067c8c4c605743023d7d3944f", - "sha256:f30c3cb33b24454a82faecaf01b19c18562b1e89558fb6c56de4d9118a032fd5", - "sha256:fb69256e180cb6c8a894fee62b3afebae785babc1ee98b81cdf68bbca1987f33", - "sha256:fd1abc0d89e30cc4e02e4064dc67fcc51bd941eb395c502aac3ec19fab46b519", - "sha256:ff8fa367d09b717b2a17a052544193ad76cd49979c805768879cb63d9ca50561" + "sha256:0099d79bdfcf5c1f0c2c72f91516702ebf8b0b8ddd8905f97a8aecf49712c621", + "sha256:0713f3adb9d03d49d365b70b84775d0a0d18e4ab08d12bc46baa6132ba78aaf6", + "sha256:07afec21bbbbf8a5cc3651aa96b980afe2526e7f048fdfb7f1014d84acc8b6d8", + "sha256:0b309d1747110feb25d7ed6b01afdec269c647d382c857ef4663bbe6ad95a912", + "sha256:0d99dd8ff461990f12d6e42c7347fd9ab2532fb70e9621ba520f9e8637161d7c", + "sha256:0de7b687289d3c1b3e8660d0741874abe7888100efe14bd0f9fd7141bcbda92b", + "sha256:1110e22af8ca26b90bd6364fe4c763329b0ebf1ee213ba32b68c73de5752323d", + "sha256:130272c698667a982a5d0e626851ceff662565379baf0ff2cc58067b81d4f11d", + "sha256:136815f06a3ae311fae551c3df1f998a1ebd01ddd424aa5603a4336997629e95", + "sha256:14215b71a762336254351b00ec720a8e85cada43b987da5a042e4ce3e82bd68e", + "sha256:1db4e7fefefd0f548d73e2e2e041f9df5c59e178b4c72fbac4cc6f535cfb1565", + "sha256:1ffd9493de4c922f2a38c2bf62b831dcec90ac673ed1ca182fe11b4d8e9f2a64", + "sha256:2006769bd1640bdf4d5641c69a3d63b71b81445473cac5ded39740a226fa88ab", + "sha256:20587d20f557fe189b7947d8e7ec5afa110ccf72a3128d61a2a387c3313f46be", + "sha256:223217c3d4f82c3ac5e29032b3f1c2eb0fb591b72161f86d93f5719079dae93e", + "sha256:27623ba66c183eca01bf9ff833875b459cad267aeeb044477fedac35e19ba907", + "sha256:285e96d9d53422efc0d7a17c60e59f37fbf3dfa942073f666db4ac71e8d726d0", + "sha256:2de62e8801ddfff069cd5c504ce3bc9672b23266597d4e4f50eda28846c322f2", + "sha256:2f6c34da58ea9c1a9515621f4d9ac379871a8f21168ba1b5e09d74250de5ad62", + "sha256:309a7de0a0ff3040acaebb35ec45d18db4b28232f21998851cfa709eeff49d62", + "sha256:35c404d74c2926d0287fbd63ed5d27eb911eb9e4a3bb2c6d294f3cfd4a9e0c23", + "sha256:3710a9751938947e6327ea9f3ea6332a09bf0ba0c09cae9cb1f250bd1f1549bc", + "sha256:3d59d125ffbd6d552765510e3f31ed75ebac2c7470c7274195b9161a32350284", + "sha256:40d3ff7fc90b98c637bda91c89d51264a3dcf210cade3a2c6f838c7268d7a4ca", + "sha256:425c5f215d0eecee9a56cdb703203dda90423247421bf0d67125add85d0c4455", + "sha256:43193c5cda5d612f247172016c4bb71251c784d7a4d9314677186a838ad34858", + "sha256:44aeb140295a2f0659e113b31cfe92c9061622cadbc9e2a2f7b8ef6b1e29ef4b", + "sha256:47334db71978b23ebcf3c0f9f5ee98b8d65992b65c9c4f2d34c2eaf5bcaf0594", + "sha256:4796efc4faf6b53a18e3d46343535caed491776a22af773f366534056c4e1fbc", + "sha256:4a51b48f42d9358460b78725283f04bddaf44a9358197b889657deba38f329db", + "sha256:4b67fdab07fdd3c10bb21edab3cbfe8cf5696f453afce75d815d9d7223fbe88b", + "sha256:4ec9dd88a5b71abfc74e9df5ebe7921c35cbb3b641181a531ca65cdb5e8e4dea", + "sha256:4f9fc98dad6c2eaa32fc3af1417d95b5e3d08aff968df0cd320066def971f9a6", + "sha256:54b6a92d009cbe2fb11054ba694bc9e284dad30a26757b1e372a1fdddaf21920", + "sha256:55f56e2ebd4e3bc50442fbc0888c9d8c94e4e06a933804e2af3e89e2f9c1c749", + "sha256:5726cf76c982532c1863fb64d8c6dd0e4c90b6ece9feb06c9f202417a31f7dd7", + "sha256:5d447056e2ca60382d460a604b6302d8db69476fd2015c81e7c35417cfabe4cd", + "sha256:5ed2e36c3e9b4f21dd9422f6893dec0abf2cca553af509b10cd630f878d3eb99", + "sha256:5ff2ed8194587faf56555927b3aa10e6fb69d931e33953943bc4f837dfee2242", + "sha256:62f60aebecfc7f4b82e3f639a7d1433a20ec32824db2199a11ad4f5e146ef5ee", + "sha256:63bc5c4ae26e4bc6be6469943b8253c0fd4e4186c43ad46e713ea61a0ba49129", + "sha256:6b40e8d38afe634559e398cc32b1472f376a4099c75fe6299ae607e404c033b2", + "sha256:6b493a043635eb376e50eedf7818f2f322eabbaa974e948bd8bdd29eb7ef2a51", + "sha256:6dba5d19c4dfab08e58d5b36304b3f92f3bd5d42c1a3fa37b5ba5cdf6dfcbcee", + "sha256:6fd30dc99682dc2c603c2b315bded2799019cea829f8bf57dc6b61efde6611c8", + "sha256:707b82d19e65c9bd28b81dde95249b07bf9f5b90ebe1ef17d9b57473f8a64b7b", + "sha256:7706f5850360ac01d80c89bcef1640683cc12ed87f42579dab6c5d3ed6888613", + "sha256:7782afc9b6b42200f7362858f9e73b1f8316afb276d316336c0ec3bd73312742", + "sha256:79983512b108e4a164b9c8d34de3992f76d48cadc9554c9e60b43f308988aabe", + "sha256:7f683ddc7eedd742e2889d2bfb96d69573fde1d92fcb811979cdb7165bb9c7d3", + "sha256:82357d85de703176b5587dbe6ade8ff67f9f69a41c0733cf2425378b49954de5", + "sha256:84450ba661fb96e9fd67629b93d2941c871ca86fc38d835d19d4225ff946a631", + "sha256:86f4e8cca779080f66ff4f191a685ced73d2f72d50216f7112185dc02b90b9b7", + "sha256:8cda06946eac330cbe6598f77bb54e690b4ca93f593dee1568ad22b04f347c15", + "sha256:8ce7fd6767a1cc5a92a639b391891bf1c268b03ec7e021c7d6d902285259685c", + "sha256:8ff4e7cdfdb1ab5698e675ca622e72d58a6fa2a8aa58195de0c0061288e6e3ea", + "sha256:9289fd5dddcf57bab41d044f1756550f9e7cf0c8e373b8cdf0ce8773dc4bd417", + "sha256:92a7e36b000bf022ef3dbb9c46bfe2d52c047d5e3f3343f43204263c5addc250", + "sha256:92db3c28b5b2a273346bebb24857fda45601aef6ae1c011c0a997106581e8a88", + "sha256:95c3c157765b031331dd4db3c775e58deaee050a3042fcad72cbc4189d7c8dca", + "sha256:980b4f289d1d90ca5efcf07958d3eb38ed9c0b7676bf2831a54d4f66f9c27dfa", + "sha256:9ae4ef0b3f6b41bad6366fb0ea4fc1d7ed051528e113a60fa2a65a9abb5b1d99", + "sha256:9c98230f5042f4945f957d006edccc2af1e03ed5e37ce7c373f00a5a4daa6149", + "sha256:9fa2566ca27d67c86569e8c85297aaf413ffab85a8960500f12ea34ff98e4c41", + "sha256:a14969b8691f7998e74663b77b4c36c0337cb1df552da83d5c9004a93afdb574", + "sha256:a8aacce6e2e1edcb6ac625fb0f8c3a9570ccc7bfba1f63419b3769ccf6a00ed0", + "sha256:a8e538f46104c815be19c975572d74afb53f29650ea2025bbfaef359d2de2f7f", + "sha256:aa41e526a5d4a9dfcfbab0716c7e8a1b215abd3f3df5a45cf18a12721d31cb5d", + "sha256:aa693779a8b50cd97570e5a0f343538a8dbd3e496fa5dcb87e29406ad0299654", + "sha256:ab22fbd9765e6954bc0bcff24c25ff71dcbfdb185fcdaca49e81bac68fe724d3", + "sha256:ab2e5bef076f5a235c3774b4f4028a680432cded7cad37bba0fd90d64b187d19", + "sha256:ab973df98fc99ab39080bfb0eb3a925181454d7c3ac8a1e695fddfae696d9e90", + "sha256:af73657b7a68211996527dbfeffbb0864e043d270580c5aef06dc4b659a4b578", + "sha256:b197e7094f232959f8f20541ead1d9862ac5ebea1d58e9849c1bf979255dfac9", + "sha256:b295729485b06c1a0683af02a9e42d2caa9db04a373dc38a6a58cdd1e8abddf1", + "sha256:b8831399554b92b72af5932cdbbd4ddc55c55f631bb13ff8fe4e6536a06c5c51", + "sha256:b8dcd239c743aa2f9c22ce674a145e0a25cb1566c495928440a181ca1ccf6719", + "sha256:bcb4f8ea87d03bc51ad04add8ceaf9b0f085ac045ab4d74e73bbc2dc033f0236", + "sha256:bd7af3717683bea4c87acd8c0d3d5b44d56120b26fd3f8a692bdd2d5260c620a", + "sha256:bf4475b82be41b07cc5e5ff94810e6a01f276e37c2d55571e3fe175e467a1a1c", + "sha256:c3e446d253bd88f6377260d07c895816ebf33ffffd56c1c792b13bff9c3e1ade", + "sha256:c57516e58fd17d03ebe67e181a4e4e2ccab1168f8c2976c6a334d4f819fe5944", + "sha256:c94057af19bc953643a33581844649a7fdab902624d2eb739738a30e2b3e60fc", + "sha256:cab5d0b79d987c67f3b9e9c53f54a61360422a5a0bc075f43cab5621d530c3b6", + "sha256:ce031db0408e487fd2775d745ce30a7cd2923667cf3b69d48d219f1d8f5ddeb6", + "sha256:cee4373f4d3ad28f1ab6290684d8e2ebdb9e7a1b74fdc39e4c211995f77bec27", + "sha256:d5b054862739d276e09928de37c79ddeec42a6e1bfc55863be96a36ba22926f6", + "sha256:dbe03226baf438ac4fda9e2d0715022fd579cb641c4cf639fa40d53b2fe6f3e2", + "sha256:dc15e99b2d8a656f8e666854404f1ba54765871104e50c8e9813af8a7db07f12", + "sha256:dcaf7c1524c0542ee2fc82cc8ec337f7a9f7edee2532421ab200d2b920fc97cf", + "sha256:dd4eda173a9fcccb5f2e2bd2a9f423d180194b1bf17cf59e3269899235b2a114", + "sha256:dd9a8bd8900e65504a305bf8ae6fa9fbc66de94178c420791d0293702fce2df7", + "sha256:de7376c29d95d6719048c194a9cf1a1b0393fbe8488a22008610b0361d834ecf", + "sha256:e7fdd52961feb4c96507aa649550ec2a0d527c086d284749b2f582f2d40a2e0d", + "sha256:e91f541a85298cf35433bf66f3fab2a4a2cff05c127eeca4af174f6d497f0d4b", + "sha256:e9e3c4c9e1ed40ea53acf11e2a386383c3304212c965773704e4603d589343ed", + "sha256:ee803480535c44e7f5ad00788526da7d85525cfefaf8acf8ab9a310000be4b03", + "sha256:f09cb5a7bbe1ecae6e87901a2eb23e0256bb524a79ccc53eb0b7629fbe7677c4", + "sha256:f19c1585933c82098c2a520f8ec1227f20e339e33aca8fa6f956f6691b784e67", + "sha256:f1a2f519ae173b5b6a2c9d5fa3116ce16e48b3462c8b96dfdded11055e3d6365", + "sha256:f28f891ccd15c514a0981f3b9db9aa23d62fe1a99997512b0491d2ed323d229a", + "sha256:f3e73a4255342d4eb26ef6df01e3962e73aa29baa3124a8e824c5d3364a65748", + "sha256:f606a1881d2663630ea5b8ce2efe2111740df4b687bd78b34a8131baa007f79b", + "sha256:fe9f97feb71aa9896b81973a7bbada8c49501dc73e58a10fcef6663af95e5079", + "sha256:ffc519621dce0c767e96b9c53f09c5d215578e10b02c285809f76509a3931482" ], "markers": "python_full_version >= '3.7.0'", - "version": "==3.3.2" + "version": "==3.4.0" }, "click": { "hashes": [ @@ -177,11 +192,11 @@ }, "idna": { "hashes": [ - "sha256:9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca", - "sha256:c05567e9c24a6b9faaa835c4821bad0590fbb9d5779e7caa6e1cc4978e7eb24f" + "sha256:12f65c9b470abda6dc35cf8e63cc574b1c52b11df2c86030af0ac09b01b13ea9", + "sha256:946d195a0d259cbba61165e88e65941f16e9b36ea6ddb97f00452bae8b1287d3" ], - "markers": "python_version >= '3.5'", - "version": "==3.6" + "markers": "python_version >= '3.6'", + "version": "==3.10" }, "importlib-metadata": { "hashes": [ @@ -201,11 +216,12 @@ }, "jinja2": { "hashes": [ - "sha256:7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa", - "sha256:ac8bd6544d4bb2c9792bf3a159e80bba8fda7f07e81bc3aed565432d5925ba90" + "sha256:4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369", + "sha256:bc5dd2abb727a5319567b7a813e6a2e7318c39f4f487cfe6c89c6f9c7d25197d" ], + "index": "pypi", "markers": "python_version >= '3.7'", - "version": "==3.1.3" + "version": "==3.1.4" }, "jsonschema": { "hashes": [ @@ -225,69 +241,70 @@ }, "markupsafe": { "hashes": [ - "sha256:00e046b6dd71aa03a41079792f8473dc494d564611a8f89bbbd7cb93295ebdcf", - "sha256:075202fa5b72c86ad32dc7d0b56024ebdbcf2048c0ba09f1cde31bfdd57bcfff", - "sha256:0e397ac966fdf721b2c528cf028494e86172b4feba51d65f81ffd65c63798f3f", - "sha256:17b950fccb810b3293638215058e432159d2b71005c74371d784862b7e4683f3", - "sha256:1f3fbcb7ef1f16e48246f704ab79d79da8a46891e2da03f8783a5b6fa41a9532", - "sha256:2174c595a0d73a3080ca3257b40096db99799265e1c27cc5a610743acd86d62f", - "sha256:2b7c57a4dfc4f16f7142221afe5ba4e093e09e728ca65c51f5620c9aaeb9a617", - "sha256:2d2d793e36e230fd32babe143b04cec8a8b3eb8a3122d2aceb4a371e6b09b8df", - "sha256:30b600cf0a7ac9234b2638fbc0fb6158ba5bdcdf46aeb631ead21248b9affbc4", - "sha256:397081c1a0bfb5124355710fe79478cdbeb39626492b15d399526ae53422b906", - "sha256:3a57fdd7ce31c7ff06cdfbf31dafa96cc533c21e443d57f5b1ecc6cdc668ec7f", - "sha256:3c6b973f22eb18a789b1460b4b91bf04ae3f0c4234a0a6aa6b0a92f6f7b951d4", - "sha256:3e53af139f8579a6d5f7b76549125f0d94d7e630761a2111bc431fd820e163b8", - "sha256:4096e9de5c6fdf43fb4f04c26fb114f61ef0bf2e5604b6ee3019d51b69e8c371", - "sha256:4275d846e41ecefa46e2015117a9f491e57a71ddd59bbead77e904dc02b1bed2", - "sha256:4c31f53cdae6ecfa91a77820e8b151dba54ab528ba65dfd235c80b086d68a465", - "sha256:4f11aa001c540f62c6166c7726f71f7573b52c68c31f014c25cc7901deea0b52", - "sha256:5049256f536511ee3f7e1b3f87d1d1209d327e818e6ae1365e8653d7e3abb6a6", - "sha256:58c98fee265677f63a4385256a6d7683ab1832f3ddd1e66fe948d5880c21a169", - "sha256:598e3276b64aff0e7b3451b72e94fa3c238d452e7ddcd893c3ab324717456bad", - "sha256:5b7b716f97b52c5a14bffdf688f971b2d5ef4029127f1ad7a513973cfd818df2", - "sha256:5dedb4db619ba5a2787a94d877bc8ffc0566f92a01c0ef214865e54ecc9ee5e0", - "sha256:619bc166c4f2de5caa5a633b8b7326fbe98e0ccbfacabd87268a2b15ff73a029", - "sha256:629ddd2ca402ae6dbedfceeba9c46d5f7b2a61d9749597d4307f943ef198fc1f", - "sha256:656f7526c69fac7f600bd1f400991cc282b417d17539a1b228617081106feb4a", - "sha256:6ec585f69cec0aa07d945b20805be741395e28ac1627333b1c5b0105962ffced", - "sha256:72b6be590cc35924b02c78ef34b467da4ba07e4e0f0454a2c5907f473fc50ce5", - "sha256:7502934a33b54030eaf1194c21c692a534196063db72176b0c4028e140f8f32c", - "sha256:7a68b554d356a91cce1236aa7682dc01df0edba8d043fd1ce607c49dd3c1edcf", - "sha256:7b2e5a267c855eea6b4283940daa6e88a285f5f2a67f2220203786dfa59b37e9", - "sha256:823b65d8706e32ad2df51ed89496147a42a2a6e01c13cfb6ffb8b1e92bc910bb", - "sha256:8590b4ae07a35970728874632fed7bd57b26b0102df2d2b233b6d9d82f6c62ad", - "sha256:8dd717634f5a044f860435c1d8c16a270ddf0ef8588d4887037c5028b859b0c3", - "sha256:8dec4936e9c3100156f8a2dc89c4b88d5c435175ff03413b443469c7c8c5f4d1", - "sha256:97cafb1f3cbcd3fd2b6fbfb99ae11cdb14deea0736fc2b0952ee177f2b813a46", - "sha256:a17a92de5231666cfbe003f0e4b9b3a7ae3afb1ec2845aadc2bacc93ff85febc", - "sha256:a549b9c31bec33820e885335b451286e2969a2d9e24879f83fe904a5ce59d70a", - "sha256:ac07bad82163452a6884fe8fa0963fb98c2346ba78d779ec06bd7a6262132aee", - "sha256:ae2ad8ae6ebee9d2d94b17fb62763125f3f374c25618198f40cbb8b525411900", - "sha256:b91c037585eba9095565a3556f611e3cbfaa42ca1e865f7b8015fe5c7336d5a5", - "sha256:bc1667f8b83f48511b94671e0e441401371dfd0f0a795c7daa4a3cd1dde55bea", - "sha256:bec0a414d016ac1a18862a519e54b2fd0fc8bbfd6890376898a6c0891dd82e9f", - "sha256:bf50cd79a75d181c9181df03572cdce0fbb75cc353bc350712073108cba98de5", - "sha256:bff1b4290a66b490a2f4719358c0cdcd9bafb6b8f061e45c7a2460866bf50c2e", - "sha256:c061bb86a71b42465156a3ee7bd58c8c2ceacdbeb95d05a99893e08b8467359a", - "sha256:c8b29db45f8fe46ad280a7294f5c3ec36dbac9491f2d1c17345be8e69cc5928f", - "sha256:ce409136744f6521e39fd8e2a24c53fa18ad67aa5bc7c2cf83645cce5b5c4e50", - "sha256:d050b3361367a06d752db6ead6e7edeb0009be66bc3bae0ee9d97fb326badc2a", - "sha256:d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b", - "sha256:d9fad5155d72433c921b782e58892377c44bd6252b5af2f67f16b194987338a4", - "sha256:daa4ee5a243f0f20d528d939d06670a298dd39b1ad5f8a72a4275124a7819eff", - "sha256:db0b55e0f3cc0be60c1f19efdde9a637c32740486004f20d1cff53c3c0ece4d2", - "sha256:e61659ba32cf2cf1481e575d0462554625196a1f2fc06a1c777d3f48e8865d46", - "sha256:ea3d8a3d18833cf4304cd2fc9cbb1efe188ca9b5efef2bdac7adc20594a0e46b", - "sha256:ec6a563cff360b50eed26f13adc43e61bc0c04d94b8be985e6fb24b81f6dcfdf", - "sha256:f5dfb42c4604dddc8e4305050aa6deb084540643ed5804d7455b5df8fe16f5e5", - "sha256:fa173ec60341d6bb97a89f5ea19c85c5643c1e7dedebc22f5181eb73573142c5", - "sha256:fa9db3f79de01457b03d4f01b34cf91bc0048eb2c3846ff26f66687c2f6d16ab", - "sha256:fce659a462a1be54d2ffcacea5e3ba2d74daa74f30f5f143fe0c58636e355fdd", - "sha256:ffee1f21e5ef0d712f9033568f8344d5da8cc2869dbd08d87c84656e6a2d2f68" + "sha256:0bff5e0ae4ef2e1ae4fdf2dfd5b76c75e5c2fa4132d05fc1b0dabcd20c7e28c4", + "sha256:0f4ca02bea9a23221c0182836703cbf8930c5e9454bacce27e767509fa286a30", + "sha256:1225beacc926f536dc82e45f8a4d68502949dc67eea90eab715dea3a21c1b5f0", + "sha256:131a3c7689c85f5ad20f9f6fb1b866f402c445b220c19fe4308c0b147ccd2ad9", + "sha256:15ab75ef81add55874e7ab7055e9c397312385bd9ced94920f2802310c930396", + "sha256:1a9d3f5f0901fdec14d8d2f66ef7d035f2157240a433441719ac9a3fba440b13", + "sha256:1c99d261bd2d5f6b59325c92c73df481e05e57f19837bdca8413b9eac4bd8028", + "sha256:1e084f686b92e5b83186b07e8a17fc09e38fff551f3602b249881fec658d3eca", + "sha256:2181e67807fc2fa785d0592dc2d6206c019b9502410671cc905d132a92866557", + "sha256:2cb8438c3cbb25e220c2ab33bb226559e7afb3baec11c4f218ffa7308603c832", + "sha256:3169b1eefae027567d1ce6ee7cae382c57fe26e82775f460f0b2778beaad66c0", + "sha256:3809ede931876f5b2ec92eef964286840ed3540dadf803dd570c3b7e13141a3b", + "sha256:38a9ef736c01fccdd6600705b09dc574584b89bea478200c5fbf112a6b0d5579", + "sha256:3d79d162e7be8f996986c064d1c7c817f6df3a77fe3d6859f6f9e7be4b8c213a", + "sha256:444dcda765c8a838eaae23112db52f1efaf750daddb2d9ca300bcae1039adc5c", + "sha256:48032821bbdf20f5799ff537c7ac3d1fba0ba032cfc06194faffa8cda8b560ff", + "sha256:4aa4e5faecf353ed117801a068ebab7b7e09ffb6e1d5e412dc852e0da018126c", + "sha256:52305740fe773d09cffb16f8ed0427942901f00adedac82ec8b67752f58a1b22", + "sha256:569511d3b58c8791ab4c2e1285575265991e6d8f8700c7be0e88f86cb0672094", + "sha256:57cb5a3cf367aeb1d316576250f65edec5bb3be939e9247ae594b4bcbc317dfb", + "sha256:5b02fb34468b6aaa40dfc198d813a641e3a63b98c2b05a16b9f80b7ec314185e", + "sha256:6381026f158fdb7c72a168278597a5e3a5222e83ea18f543112b2662a9b699c5", + "sha256:6af100e168aa82a50e186c82875a5893c5597a0c1ccdb0d8b40240b1f28b969a", + "sha256:6c89876f41da747c8d3677a2b540fb32ef5715f97b66eeb0c6b66f5e3ef6f59d", + "sha256:6e296a513ca3d94054c2c881cc913116e90fd030ad1c656b3869762b754f5f8a", + "sha256:70a87b411535ccad5ef2f1df5136506a10775d267e197e4cf531ced10537bd6b", + "sha256:7e94c425039cde14257288fd61dcfb01963e658efbc0ff54f5306b06054700f8", + "sha256:846ade7b71e3536c4e56b386c2a47adf5741d2d8b94ec9dc3e92e5e1ee1e2225", + "sha256:88416bd1e65dcea10bc7569faacb2c20ce071dd1f87539ca2ab364bf6231393c", + "sha256:88b49a3b9ff31e19998750c38e030fc7bb937398b1f78cfa599aaef92d693144", + "sha256:8c4e8c3ce11e1f92f6536ff07154f9d49677ebaaafc32db9db4620bc11ed480f", + "sha256:8e06879fc22a25ca47312fbe7c8264eb0b662f6db27cb2d3bbbc74b1df4b9b87", + "sha256:9025b4018f3a1314059769c7bf15441064b2207cb3f065e6ea1e7359cb46db9d", + "sha256:93335ca3812df2f366e80509ae119189886b0f3c2b81325d39efdb84a1e2ae93", + "sha256:9778bd8ab0a994ebf6f84c2b949e65736d5575320a17ae8984a77fab08db94cf", + "sha256:9e2d922824181480953426608b81967de705c3cef4d1af983af849d7bd619158", + "sha256:a123e330ef0853c6e822384873bef7507557d8e4a082961e1defa947aa59ba84", + "sha256:a904af0a6162c73e3edcb969eeeb53a63ceeb5d8cf642fade7d39e7963a22ddb", + "sha256:ad10d3ded218f1039f11a75f8091880239651b52e9bb592ca27de44eed242a48", + "sha256:b424c77b206d63d500bcb69fa55ed8d0e6a3774056bdc4839fc9298a7edca171", + "sha256:b5a6b3ada725cea8a5e634536b1b01c30bcdcd7f9c6fff4151548d5bf6b3a36c", + "sha256:ba8062ed2cf21c07a9e295d5b8a2a5ce678b913b45fdf68c32d95d6c1291e0b6", + "sha256:ba9527cdd4c926ed0760bc301f6728ef34d841f405abf9d4f959c478421e4efd", + "sha256:bbcb445fa71794da8f178f0f6d66789a28d7319071af7a496d4d507ed566270d", + "sha256:bcf3e58998965654fdaff38e58584d8937aa3096ab5354d493c77d1fdd66d7a1", + "sha256:c0ef13eaeee5b615fb07c9a7dadb38eac06a0608b41570d8ade51c56539e509d", + "sha256:cabc348d87e913db6ab4aa100f01b08f481097838bdddf7c7a84b7575b7309ca", + "sha256:cdb82a876c47801bb54a690c5ae105a46b392ac6099881cdfb9f6e95e4014c6a", + "sha256:cfad01eed2c2e0c01fd0ecd2ef42c492f7f93902e39a42fc9ee1692961443a29", + "sha256:d16a81a06776313e817c951135cf7340a3e91e8c1ff2fac444cfd75fffa04afe", + "sha256:d8213e09c917a951de9d09ecee036d5c7d36cb6cb7dbaece4c71a60d79fb9798", + "sha256:e07c3764494e3776c602c1e78e298937c3315ccc9043ead7e685b7f2b8d47b3c", + "sha256:e17c96c14e19278594aa4841ec148115f9c7615a47382ecb6b82bd8fea3ab0c8", + "sha256:e444a31f8db13eb18ada366ab3cf45fd4b31e4db1236a4448f68778c1d1a5a2f", + "sha256:e6a2a455bd412959b57a172ce6328d2dd1f01cb2135efda2e4576e8a23fa3b0f", + "sha256:eaa0a10b7f72326f1372a713e73c3f739b524b3af41feb43e4921cb529f5929a", + "sha256:eb7972a85c54febfb25b5c4b4f3af4dcc731994c7da0d8a0b4a6eb0640e1d178", + "sha256:ee55d3edf80167e48ea11a923c7386f4669df67d7994554387f84e7d8b0a2bf0", + "sha256:f3818cb119498c0678015754eba762e0d61e5b52d34c8b13d770f0719f7b1d79", + "sha256:f8b3d067f2e40fe93e1ccdd6b2e1d16c43140e76f02fb1319a05cf2b79d99430", + "sha256:fcabf5ff6eea076f859677f5f0b6b5c1a51e70a376b0579e0eadef8db48c6b50" ], - "markers": "python_version >= '3.7'", - "version": "==2.1.5" + "markers": "python_version >= '3.9'", + "version": "==3.0.2" }, "mnemonic": { "hashes": [ @@ -427,11 +444,12 @@ }, "requests": { "hashes": [ - "sha256:58cd2187c01e70e6e26505bca751777aa9f2ee0b7f4300988b709f44e013003f", - "sha256:942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1" + "sha256:dd951ff5ecf3e3b3aa26b40703ba77495dab41da839ae72ef3c8e5d8e2433289", + "sha256:fc06670dd0ed212426dfeb94fc1b983d917c4f9847c863f313c9dfaaffb7c23c" ], "index": "pypi", - "version": "==2.31.0" + "markers": "python_version >= '3.8'", + "version": "==2.32.2" }, "six": { "hashes": [ @@ -451,27 +469,29 @@ }, "urllib3": { "hashes": [ - "sha256:450b20ec296a467077128bff42b73080516e71b56ff59a60a02bef2232c4fa9d", - "sha256:d0570876c61ab9e520d776c38acbbb5b05a776d3f9ff98a5c8fd5162a444cf19" + "sha256:ca899ca043dcb1bafa3e262d73aa25c465bfb49e0bd9dd5d59f1d0acba2f8fac", + "sha256:e7d814a81dad81e6caf2ec9fdedb284ecc9c73076b62654547cc64ccdcae26e9" ], "markers": "python_version >= '3.8'", - "version": "==2.2.1" + "version": "==2.2.3" }, "werkzeug": { "hashes": [ - "sha256:3aac3f5da756f93030740bc235d3e09449efcf65f2f55e3602e1d851b8f48795", - "sha256:e39b645a6ac92822588e7b39a692e7828724ceae0b0d702ef96701f90e70128d" + "sha256:1bc0c2310d2fbb07b1dd1105eba2f7af72f322e1e455f2f93c993bee8c8a5f17", + "sha256:a8dd59d4de28ca70471a34cba79bed5f7ef2e036a76b3ab0835474246eb41f8d" ], + "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==3.0.2" + "version": "==3.0.6" }, "zipp": { "hashes": [ - "sha256:206f5a15f2af3dbaee80769fb7dc6f249695e940acca08dfb2a4769fe61e538b", - "sha256:2884ed22e7d8961de1c9a05142eb69a247f120291bc0206a00a7642f09b5b715" + "sha256:2828e64edb5386ea6a52e7ba7cdb17bb30a73a858f5eb6eb93d8d36f5ea26091", + "sha256:35427f6d5594f4acf82d25541438348c26736fa9b3afa2754bcd63cdb99d8e8f" ], + "index": "pypi", "markers": "python_version >= '3.8'", - "version": "==3.18.1" + "version": "==3.19.1" } }, "develop": {} diff --git a/speculos/main.py b/speculos/main.py index f7ba54db..96f9aa23 100644 --- a/speculos/main.py +++ b/speculos/main.py @@ -29,6 +29,7 @@ from .mcu.finger_tcp import FakeFinger from .mcu.struct import DisplayArgs, ServerArgs from .mcu.vnc import VNC +from .mcu.transport import TransportType from .observer import BroadcastInterface from .resources_importer import resources @@ -268,7 +269,9 @@ def main(prog=None) -> int: 'to use a hex seed, prefix it with "hex:"') parser.add_argument('-t', '--trace', action='store_true', help='Trace syscalls') parser.add_argument('-u', '--usb', default='hid', help='Configure the USB transport protocol, ' - 'either HID (default) or U2F') + 'either HID (default) or U2F (DEPRECATED, use `--transport` instead)') + parser.add_argument('-T', '--transport', default=None, choices=('HID', 'U2F', 'NFC'), + help='Configure the transport protocol: HID (default), U2F or NFC.') group = parser.add_argument_group('network arguments') group.add_argument('--apdu-port', default=9999, type=int, help='ApduServer TCP port') @@ -466,6 +469,12 @@ def main(prog=None) -> int: qemu_pid = run_qemu(s1, s2, args, use_bagl) s1.close() + # The `--transport` argument takes precedence over `--usb` + if args.transport is not None: + transport_type = TransportType[args.transport] + else: + transport_type = TransportType[args.usb.upper()] + apdu = apdu_server.ApduServer(host="0.0.0.0", port=args.apdu_port) seph = seproxyhal.SeProxyHal( s2, @@ -473,7 +482,7 @@ def main(prog=None) -> int: use_bagl=use_bagl, automation=automation_path, automation_server=automation_server, - transport=args.usb) + transport=transport_type) button = None if args.button_port: diff --git a/speculos/mcu/seproxyhal.py b/speculos/mcu/seproxyhal.py index 8eed5ca3..09810a7f 100644 --- a/speculos/mcu/seproxyhal.py +++ b/speculos/mcu/seproxyhal.py @@ -8,7 +8,7 @@ from typing import Callable, List, Optional, Tuple from speculos.observer import BroadcastInterface, TextEvent -from . import usb +from .transport import build_transport, TransportType from .automation import Automation from .display import DisplayNotifier, IODevice from .nbgl import NBGL @@ -30,6 +30,9 @@ class SephTag(IntEnum): USB_CONFIG = 0x4f USB_EP_PREPARE = 0x50 + NFC_RAPDU = 0x4A + NFC_POWER = 0x34 + REQUEST_STATUS = 0x52 RAPDU = 0x53 PLAY_TUNE = 0x56 @@ -253,7 +256,7 @@ def __init__(self, use_bagl: bool, automation: Optional[Automation] = None, automation_server: Optional[BroadcastInterface] = None, - transport: str = 'hid'): + transport: TransportType = TransportType.HID): self._socket = sock self.logger = logging.getLogger("seproxyhal") self.printf_queue = '' @@ -270,7 +273,7 @@ def __init__(self, self.socket_helper.wait_until_tick_is_processed) self.time_ticker_thread.start() - self.usb = usb.USB(self.socket_helper.queue_packet, transport=transport) + self.transport = build_transport(self.socket_helper.queue_packet, transport) self.ocr = OCR(model, use_bagl) @@ -389,10 +392,10 @@ def can_read(self, screen: DisplayNotifier): c(data) elif tag == SephTag.USB_CONFIG: - self.usb.config(data) + self.transport.config(data) elif tag == SephTag.USB_EP_PREPARE: - data = self.usb.prepare(data) + data = self.transport.prepare(data) if data: for c in self.apdu_callbacks: c(data) @@ -449,6 +452,13 @@ def can_read(self, screen: DisplayNotifier): assert isinstance(screen.display.gl, NBGL) screen.display.gl.hal_draw_image_file(data) + elif tag == SephTag.NFC_RAPDU: + data = self.transport.handle_rapdu(data) + if data is not None: + for c in self.apdu_callbacks: + c(data) + screen.display.forward_to_apdu_client(data) + else: self.logger.error(f"unknown tag: {tag:#x}") sys.exit(0) @@ -506,7 +516,7 @@ def to_app(self, packet: bytes): tag, packet = packet[4], packet[5:] self.socket_helper.queue_packet(SephTag(tag), packet) else: - self.usb.xfer(packet) + self.transport.send(packet) def get_tick_count(self): return self.socket_helper.get_tick_count() diff --git a/speculos/mcu/transport/__init__.py b/speculos/mcu/transport/__init__.py new file mode 100644 index 00000000..2def3fc8 --- /dev/null +++ b/speculos/mcu/transport/__init__.py @@ -0,0 +1,17 @@ +from typing import Callable + +from .interface import TransportLayer, TransportType +from .nfc import NFC +from .usb import HID, U2F + + +def build_transport(cb: Callable, transport: TransportType) -> TransportLayer: + if transport is TransportType.NFC: + return NFC(cb, transport) + elif transport is TransportType.U2F: + return U2F(cb, transport) + else: + return HID(cb, transport) + + +__all__ = ["build_transport", "TransportType"] diff --git a/speculos/mcu/transport/interface.py b/speculos/mcu/transport/interface.py new file mode 100644 index 00000000..2eff09a2 --- /dev/null +++ b/speculos/mcu/transport/interface.py @@ -0,0 +1,36 @@ +from abc import ABC, abstractmethod +from enum import auto, IntEnum +from typing import Callable, Optional + + +class TransportType(IntEnum): + HID = auto() + NFC = auto() + U2F = auto() + + +class TransportLayer(ABC): + + def __init__(self, send_cb: Callable, transport: TransportType): + self._transport = transport + self._send_cb = send_cb + + @property + def type(self) -> TransportType: + return self._transport + + @abstractmethod + def config(self, data: bytes) -> None: + raise NotImplementedError + + @abstractmethod + def prepare(self, data: bytes) -> Optional[bytes]: + raise NotImplementedError + + @abstractmethod + def send(self, data: bytes) -> None: + raise NotImplementedError + + @abstractmethod + def handle_rapdu(self, data: bytes) -> Optional[bytes]: + raise NotImplementedError diff --git a/speculos/mcu/transport/nfc.py b/speculos/mcu/transport/nfc.py new file mode 100644 index 00000000..3d308885 --- /dev/null +++ b/speculos/mcu/transport/nfc.py @@ -0,0 +1,75 @@ +""" +Forward NFC packets between the MCU and the SE +""" + +import enum +import logging +from typing import List, Optional + +from .interface import TransportLayer, TransportType + + +class SephNfcTag(enum.IntEnum): + NFC_APDU_EVENT = 0x1C + NFC_EVENT = 0x1E + + +class NFC(TransportLayer): + def __init__(self, send_cb, transport: TransportType): + super().__init__(send_cb, transport) + self.MTU = 140 + self.rx_sequence = 0 + self.rx_size = 0 + self.rx_data: bytes = b'' + self.logger = logging.getLogger("NFC") + + def config(self, data: bytes) -> None: + self.logger.warning("USB-specific 'config' method called on NFC transport. Ignored.") + + def prepare(self, data: bytes) -> None: + self.logger.warning("USB-specific 'prepare' method called on NFC transport. Ignored.") + + def handle_rapdu(self, data: bytes) -> Optional[bytes]: + """concatenate apdu chunks into full apdu""" + # example of data + # 0000050000002b3330000409312e302e302d72633104e600000008362e312e302d646508352e312e302d6465010001009000 + + # only APDU packets are supported + if data[2] != 0x05: + return None + + sequence = int.from_bytes(data[3:5], 'big') + assert self.rx_sequence == sequence, f"Unexpected sequence number:{sequence}" + + if sequence == 0: + self.rx_size = int.from_bytes(data[5:7], "big") + self.rx_data = data[7:] + else: + self.rx_data += data[5:] + + if len(self.rx_data) == self.rx_size: + # prepare for next call + self.rx_sequence = 0 + return self.rx_data + else: + self.rx_sequence += 1 + return None + + def send(self, data: bytes) -> None: + chunks: List[bytes] = [] + data_len = len(data) + + while len(data) > 0: + size = self.MTU - 5 + chunks.append(data[:size]) + data = data[size:] + + for i, chunk in enumerate(chunks): + # Ledger protocol header + header = bytes([0x00, 0x00, 0x05]) # APDU + header += i.to_bytes(2, "big") + # first packet contains the size of full buffer + if i == 0: + header += data_len.to_bytes(2, "big") + + self._send_cb(SephNfcTag.NFC_APDU_EVENT, header + chunk) diff --git a/speculos/mcu/usb.py b/speculos/mcu/transport/usb.py similarity index 51% rename from speculos/mcu/usb.py rename to speculos/mcu/transport/usb.py index d45e85ab..2c96fed7 100644 --- a/speculos/mcu/usb.py +++ b/speculos/mcu/transport/usb.py @@ -3,20 +3,22 @@ protocol. """ -from abc import ABC, abstractmethod -from construct import Int8ub, Int16ub, Int16ul, Struct -import binascii import enum import logging +from abc import abstractmethod +from construct import Int8ub, Int16ub, Int16ul, Struct +from typing import Callable, List, Optional + +from .interface import TransportLayer, TransportType -class UsbReq(enum.IntEnum): +class USBReq(enum.IntEnum): RECIPIENT_DEVICE = 0x00 SET_ADDRESS = 0x05 SET_CONFIGURATION = 0x09 -class SephUsbTag(enum.IntEnum): +class SephUSBTag(enum.IntEnum): XFER_SETUP = 0x01 XFER_IN = 0x02 XFER_OUT = 0x04 @@ -24,14 +26,14 @@ class SephUsbTag(enum.IntEnum): PREPARE_DIR_IN = 0x20 -class SephUsbConfig(enum.IntEnum): +class SephUSBConfig(enum.IntEnum): CONNECT = 0x01 DISCONNECT = 0x02 ADDR = 0x03 ENDPOINTS = 0x04 -class SephUsbPrepare(enum.IntEnum): +class SephUSBPrepare(enum.IntEnum): SETUP = 0x10 IN = 0x20 OUT = 0x30 @@ -39,19 +41,19 @@ class SephUsbPrepare(enum.IntEnum): UNSTALL = 0x80 -class HidEndpoint(enum.IntEnum): +class HIDEndpoint(enum.IntEnum): OUT_ADDR = 0x00 IN_ADDR = 0x80 -class UsbDevState(enum.IntEnum): +class USBDevState(enum.IntEnum): DISCONNECTED = 0 DEFAULT = 1 ADDRESSED = 2 CONFIGURED = 3 -class UsbInterface(enum.IntEnum): +class USBInterface(enum.IntEnum): GENERIC = 0 U2F = 1 HID = 2 @@ -81,7 +83,7 @@ class UsbInterface(enum.IntEnum): ) -class HidPacket: +class HIDPacket: def __init__(self): self.reset(0) @@ -103,72 +105,148 @@ def complete(self): return self.remaining_size == 0 -class Transport(ABC): - def __init__(self, interface, send_xfer): - self.interface = interface - self.send_xfer = send_xfer +class USBTransport(TransportLayer): + INTERFACE = USBInterface.GENERIC - @abstractmethod - def xfer(self, data): - pass + def __init__(self, send_cb: Callable, transport: TransportType = TransportType.HID): + super().__init__(send_cb, transport) + self.packets_to_send: List[bytes] = [] + self.state = USBDevState.DISCONNECTED + self.logger = logging.getLogger("USB") + + @property + def endpoint_in(self): + return HIDEndpoint.IN_ADDR | self.INTERFACE + + @property + def endpoint_out(self): + return HIDEndpoint.OUT_ADDR | self.INTERFACE + + def _send_xfer(self, packet: bytes) -> None: + # don't send packets until the endpoint is configured + if self.state != USBDevState.CONFIGURED or len(self.packets_to_send) > 0: + self.packets_to_send.append(packet) + return + + self.logger.debug("[SEND_XFER] %s", packet.hex()) + self._send_cb(SephUSBTag.XFER_EVENT, packet) + + def _send_setup(self, breq: USBReq, wValue: int): + data = usb_header.build(dict(endpoint=self.endpoint_out, tag=SephUSBTag.XFER_SETUP, length=0)) + data += usb_setup.build(dict(bmreq=USBReq.RECIPIENT_DEVICE, breq=breq, wValue=wValue, wIndex=0, wLength=0)) + self.logger.debug("[SEND_SETUP] %s", data.hex()) + self._send_cb(SephUSBTag.XFER_EVENT, data) + + def _flush_packets(self) -> None: + packets_to_send = self.packets_to_send + self.packets_to_send = [] + for packet in packets_to_send: + self._send_xfer(packet) + + def handle_rapdu(self, data: bytes) -> Optional[bytes]: + self.logger.warning("NFC-specific 'handle_apdu' method called on USB transport. Ignored.") + return None @abstractmethod - def build_xfer(self, data): - pass + def _config(self, data: SephUSBConfig) -> None: + raise NotImplementedError + + def config(self, data: bytes) -> None: + """Parse a config packet. If the endpoint address is set, configure it.""" + + tag = SephUSBConfig(data[0]) + self.logger.debug("[CONFIG] %s %s", repr(tag), data.hex()) + + # The USB stack is shut down with USB_power(0) before being powered on. + # Wait for the first CONNECT config message to ensure that USBD_Start() + # has been called. + if tag == SephUSBConfig.CONNECT: + if self.state == USBDevState.DISCONNECTED: + self.state = USBDevState.ADDRESSED + self.logger.debug("set_address sent") + self._send_setup(USBReq.SET_ADDRESS, 1) + + elif tag == SephUSBConfig.DISCONNECT: + self.state = USBDevState.DISCONNECTED + self._config(tag) + + elif tag == SephUSBConfig.ADDR: + if self.state == USBDevState.ADDRESSED: + self.state = USBDevState.CONFIGURED + self._send_setup(USBReq.SET_CONFIGURATION, 1) + self.logger.debug("USB configured") + + elif tag == SephUSBConfig.ENDPOINTS: + # once the endpoint is configured, queued packets can be sent + endpoint = data[2] + if endpoint == self.endpoint_out: + self._flush_packets() @abstractmethod - def prepare(self, data): - pass + def _prepare(self, data: bytes) -> Optional[bytes]: + raise NotImplementedError - def config(self, tag): - pass + def prepare(self, data: bytes) -> Optional[bytes]: + """Send or receive a packet chunk.""" - @property - def endpoint_in(self): - return HidEndpoint.IN_ADDR | self.interface + header = usb_header.parse(data[:3]) + answer = None + tag = SephUSBPrepare(header.tag) + self.logger.debug("[PREPARE] %s %s %s", repr(self.state), repr(tag), data.hex()) - @property - def endpoint_out(self): - return HidEndpoint.OUT_ADDR | self.interface + if tag == SephUSBPrepare.IN: + if header.endpoint == self.endpoint_in: + assert header.length == USB_SIZE + data = data[usb_header.sizeof():] + answer = self._prepare(data) + return answer + + +class U2F(USBTransport): + INTERFACE = USBInterface.U2F -class U2f(Transport): - def __init__(self, send_xfer): - super().__init__(UsbInterface.U2F, send_xfer) + def __init__(self, send_cb: Callable, transport: TransportType): + super().__init__(send_cb, transport) - def build_xfer(self, tag, data): + def _config(self, data: SephUSBConfig) -> None: + pass + + def _build_xfer(self, tag: SephUSBTag, data: bytes) -> bytes: packet = usb_header.build(dict(endpoint=self.endpoint_out, tag=tag, length=len(data))) packet += data return packet - def xfer(self, data): + def send(self, data: bytes) -> None: assert len(data) == USB_SIZE - packet = self.build_xfer(SephUsbTag.XFER_OUT, data) - self.send_xfer(packet) + packet = self._build_xfer(SephUSBTag.XFER_OUT, data) + self._send_xfer(packet) - def prepare(self, data): + def _prepare(self, data: bytes) -> bytes: assert len(data) == USB_SIZE - packet = self.build_xfer(SephUsbTag.XFER_IN, b'') - self.send_xfer(packet) + packet = self._build_xfer(SephUSBTag.XFER_IN, b'') + self._send_xfer(packet) return data -class Hid(Transport): +class HID(USBTransport): + INTERFACE = USBInterface.HID + USB_CHANNEL = 0x0101 USB_COMMAND = 0x05 - def __init__(self, send_xfer): - super().__init__(UsbInterface.HID, send_xfer) - self.hid_packet = HidPacket() + def __init__(self, send_cb: Callable, transport: TransportType): + super().__init__(send_cb, transport) + self.hid_packet = HIDPacket() - def _build_header(self, data, length, seq): + def _build_header(self, data: bytes, length: int, seq: int) -> bytes: header = hid_header.build(dict(channel=self.USB_CHANNEL, command=self.USB_COMMAND, seq=seq, length=length)) if seq != 0: # strip hid_header.length header = header[:-2] return header - def build_xfer(self, tag, data, seq=0, length=USB_SIZE): + def _build_xfer(self, tag: SephUSBTag, data: bytes, seq: int = 0, length: int = USB_SIZE): header = self._build_header(data, length, seq) size = len(header) + len(data) @@ -178,7 +256,7 @@ def build_xfer(self, tag, data, seq=0, length=USB_SIZE): return packet - def xfer(self, data): + def send(self, data: bytes) -> None: seq = 0 offset = 0 while offset < len(data): @@ -192,17 +270,17 @@ def xfer(self, data): else: length = len(chunk) - packet = self.build_xfer(SephUsbTag.XFER_OUT, chunk, seq, length) - self.send_xfer(packet) + packet = self._build_xfer(SephUSBTag.XFER_OUT, chunk, seq, length) + self._send_xfer(packet) offset += len(chunk) seq += 1 - def config(self, tag): - if tag == UsbDevState.DISCONNECTED: + def _config(self, tag: SephUSBConfig) -> None: + if tag == USBDevState.DISCONNECTED: self.hid_packet.reset(0) - def prepare(self, data): + def _prepare(self, data: bytes) -> Optional[bytes]: hid = hid_header.parse(data) assert hid.channel == self.USB_CHANNEL assert hid.command == self.USB_COMMAND @@ -215,8 +293,8 @@ def prepare(self, data): chunk = data[hid_header.sizeof() - 2:] self.hid_packet.append_data(chunk) - packet = self.build_xfer(SephUsbTag.XFER_IN, b'', self.hid_packet.seq) - self.send_xfer(packet) + packet = self._build_xfer(SephUSBTag.XFER_IN, b'', self.hid_packet.seq) + self._send_xfer(packet) if self.hid_packet.complete(): answer = self.hid_packet.data @@ -225,90 +303,3 @@ def prepare(self, data): answer = None return answer - - -class USB: - def __init__(self, _queue_event_packet, transport='hid'): - self._queue_event_packet = _queue_event_packet - self.packets_to_send = [] - self.state = UsbDevState.DISCONNECTED - - if transport.lower() == 'hid': - self.transport = Hid(self.send_xfer) - elif transport.lower() == 'u2f': - self.transport = U2f(self.send_xfer) - else: - raise ValueError(f"Unsupported USB transport {transport!r}") - - self.logger = logging.getLogger("usb") - - def send_xfer(self, packet): - # don't send packets until the endpoint is configured - if self.state != UsbDevState.CONFIGURED or len(self.packets_to_send) > 0: - self.packets_to_send.append(packet) - return - - self.logger.debug("[SEND_XFER] {}".format(binascii.hexlify(packet))) - self._queue_event_packet(SephUsbTag.XFER_EVENT, packet) - - def _send_setup(self, breq, wValue): - data = usb_header.build(dict(endpoint=self.transport.endpoint_out, tag=SephUsbTag.XFER_SETUP, length=0)) - data += usb_setup.build(dict(bmreq=UsbReq.RECIPIENT_DEVICE, breq=breq, wValue=wValue, wIndex=0, wLength=0)) - self.logger.debug("[SEND_SETUP] {}".format(binascii.hexlify(data))) - self._queue_event_packet(SephUsbTag.XFER_EVENT, data) - - def _flush_packets(self): - packets_to_send = self.packets_to_send - self.packets_to_send = [] - for packet in packets_to_send: - self.send_xfer(packet) - - def config(self, data): - """Parse a config packet. If the endpoint address is set, configure it.""" - - tag = SephUsbConfig(data[0]) - self.logger.debug("[CONFIG] {} {}".format(repr(tag), binascii.hexlify(data))) - - # The USB stack is shut down with USB_power(0) before being powered on. - # Wait for the first CONNECT config message to ensure that USBD_Start() - # has been called. - if tag == SephUsbConfig.CONNECT: - if self.state == UsbDevState.DISCONNECTED: - self.state = UsbDevState.ADDRESSED - self.logger.debug("set_address sent") - self._send_setup(UsbReq.SET_ADDRESS, 1) - - elif tag == SephUsbConfig.DISCONNECT: - self.state = UsbDevState.DISCONNECTED - self.transport.config(tag) - - elif tag == SephUsbConfig.ADDR: - if self.state == UsbDevState.ADDRESSED: - self.state = UsbDevState.CONFIGURED - self._send_setup(UsbReq.SET_CONFIGURATION, 1) - self.logger.debug("configured") - - elif tag == SephUsbConfig.ENDPOINTS: - # once the endpoint is configured, queued packets can be sent - endpoint = data[2] - if endpoint == self.transport.endpoint_out: - self._flush_packets() - - def prepare(self, data): - """Send or receive a packet chunk.""" - - header = usb_header.parse(data[:3]) - answer = None - tag = SephUsbPrepare(header.tag) - self.logger.debug("[PREPARE] {} {} {}".format(repr(self.state), repr(tag), binascii.hexlify(data))) - - if tag == SephUsbPrepare.IN: - if header.endpoint == self.transport.endpoint_in: - assert header.length == USB_SIZE - data = data[usb_header.sizeof():] - answer = self.transport.prepare(data) - - return answer - - def xfer(self, data): - self.transport.xfer(data) diff --git a/src/bolos/os.c b/src/bolos/os.c index 596a13dd..ccbe8a67 100644 --- a/src/bolos/os.c +++ b/src/bolos/os.c @@ -9,6 +9,7 @@ #define OS_SETTING_PLANEMODE_OLD 5 #define OS_SETTING_PLANEMODE_NEW 6 #define OS_SETTING_SOUND 9 +#define OS_SETTING_FEATURES 14 #undef PATH_MAX #define PATH_MAX 1024 @@ -54,7 +55,7 @@ unsigned long sys_os_setting_get(unsigned int setting_id, return 1; } if (((hw_model == MODEL_STAX) || (hw_model == MODEL_FLEX)) && - setting_id == OS_SETTING_SOUND) { + (setting_id == OS_SETTING_SOUND || setting_id == OS_SETTING_FEATURES)) { return 0xff; } }