From a83ec8e6ba552a5fbf42cd37fdab9fac79276cf3 Mon Sep 17 00:00:00 2001 From: Markus Ottela Date: Fri, 19 Apr 2024 17:01:44 +0300 Subject: [PATCH] Update dependencies, fix test import. --- install.sh | 26 +++++++++++++------------- install.sh.asc | 26 +++++++++++++------------- release_automation.sh | 10 +++++----- requirements-dev.txt | 12 ++++++------ requirements-relay.txt | 16 ++++++++-------- requirements.txt | 4 ++-- tests/receiver/test_key_exchanges.py | 3 +-- 7 files changed, 48 insertions(+), 49 deletions(-) diff --git a/install.sh b/install.sh index 8b435ed..77d342d 100644 --- a/install.sh +++ b/install.sh @@ -102,12 +102,12 @@ dependency_hashes['cryptography-42.0.5-pp310-pypy310_pp73-manylinux_2_28_x86_64. dependency_hashes['cryptography-42.0.5-pp39-pypy39_pp73-manylinux_2_28_aarch64.whl']='c8b8fae59303afef81daf85381596e366b60e1d5d499b6001c078bea669b1373fba37aca20a3617c54461f6797a1c655707fdee23cffb7aae8c1d6208dcff894' dependency_hashes['cryptography-42.0.5-pp39-pypy39_pp73-manylinux_2_28_x86_64.whl']='2b5b7a9667fc85c691fc107ba8b32ff8931ee6ee4c34e15784b1882d21c7fb2650d63825f1bdf14626dafe671f67e7816c79a5a8c6b7f1366f20f24ee6f32bd8' dependency_hashes['cryptography-42.0.5.tar.gz']='5524fd230b55580a2c647a0a78197a783e201fdfa8b3177b72c6d7b689afd76a689e4fe3593120d3adb7ee5cc4adf9211e8deedc8fab355e9ed70076db09f68b' -dependency_hashes['flask-3.0.2-py3-none-any.whl']='c817a1518315f0e9c733b0c08c66dcb95191029bfea649455f7e707a59f3f9104132962d498f408b4016e49dac634ffd9361c11039b6b85741b2c0b35cf38e54' -dependency_hashes['flask-3.0.2.tar.gz']='02f937dae7d654f6286eb9fcf2d68d83f3ef56dbc4d59a961ea1bd95d17fac7a5ace3f27ebb03ff0592f6a87361e59934ffda098714fc8a049a487d4c0bbc0ef' -dependency_hashes['idna-3.6-py3-none-any.whl']='0ec1ae5c928b4a0001a254c8598b746049406e1eed720bfafa94d4474078eff76bf6e032124e2d4df4619052836523af36162443c6d746487b387d2e3476e691' -dependency_hashes['idna-3.6.tar.gz']='8bea880d1b2fae1511f21381d73445f62e786c385eb949d2c39e611f71cb6f31f7e54927833a0f456e340857d384d960ab9e6ae31ac7481314254646de656cc0' -dependency_hashes['itsdangerous-2.1.2-py3-none-any.whl']='190df7f250b5e5985898a7f0e0e9d4c3d0b5c391268b9b5ad0f39667ec887b543651dff7623ba49e191ffadb42b0354b21be19ef61a1f68193924bf12034dd1d' -dependency_hashes['itsdangerous-2.1.2.tar.gz']='e4d870a33992b309ed778f403c0c1e098983a693d1165260748bf36385ebfadb583811e05ddd48001a33cf6a4e963b7dd8a8c68919c5b4b86f63621d8869e259' +dependency_hashes['flask-3.0.3-py3-none-any.whl']='efc6990982567332f1d274054a5d2f1e1b78c21f25a4cfb1de6b3a2f96fceab33fb0d31f9eb28f504e3899742fddf5854ee357395e7b66fdd3810eb64b8dff93' +dependency_hashes['flask-3.0.3.tar.gz']='977c0e5fd2d496fae8e34a035f211118642dc6518a14dc5f6c175b72c6a76407aeb9ff0ed1f5db636370a9aa7e0d36baa783713ea7bdabd7f28c8c2b94643cd1' +dependency_hashes['idna-3.7-py3-none-any.whl']='488a437198bcf2d32098d99a71447a514212d28e6149d597a347d85b638d9c1b8a328cf190f2b7872a7869f157160754f560fdbca2f2a9ba035401f0eaa9a87d' +dependency_hashes['idna-3.7.tar.gz']='b50e5ae117b67c7076125d6943e3436200676f85d7dd1b5a5414e217e73904ef077f0b1108d9781ab4afe2a66f7c9e1ce8262ce51edeb2d29e4c504147b6c4cc' +dependency_hashes['itsdangerous-2.2.0-py3-none-any.whl']='3c9d38d4a9a53f6426139969a111cb13f0588e4445173542a5c88a2f85348afc6f709f3523a4169eee6010cec99eed6df3a82cac59ca96a731d39461f88e2b83' +dependency_hashes['itsdangerous-2.2.0.tar.gz']='ed046cc371ea9aa1f7cd3bd201f1b68910a2b008bd8434c425332cecec6539cf031df6e2223a1fdccd68c12ccf5486e80f178d5906911b19417f0ea244e367f8' dependency_hashes['Jinja2-3.1.3-py3-none-any.whl']='e3e2e6bd511dec484dd0292f4c46c55c88a885eabf15413d53edea2dd4a4dbae1571735b9424f78c0cd7f1082476a8259f31fd3f63990f726175470f636df2b3' dependency_hashes['Jinja2-3.1.3.tar.gz']='5c36d0cd094b40626511f30c561176c095c49ef4066c2752a9edc3e6feb2430dafa866c17deebddcd0168aa1f0fd3944916d592c5c999639b8152e7c1009c700' dependency_hashes['MarkupSafe-2.1.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl']='f32cc6753cfaedeae6392e1f7fc8523ccbbdd996fa10636164004dba3d0d3ed80b8cccb1de3f6660c3114e8f83c260b7f92238b0a2a0bc48580ae00f4fb1f964' @@ -163,11 +163,11 @@ dependency_hashes['PySocks-1.7.1-py3-none-any.whl']='313b954102231d038d52ab58f41 dependency_hashes['PySocks-1.7.1.tar.gz']='cef4a5ce8c67fb485644696a23bf68a721db47f3211212de2d4431eaf9ebd26077dd5a06f6dfa7fde2dcb9d7c1ed551facd014e999929cb4d7b504972c464016' dependency_hashes['requests-2.31.0-py3-none-any.whl']='b795abb26ba2f04f1afcfb196f21f638014b26c8186f8f488f1c2d91e8e0220962fbd259dbc9c3875222eb47fc95c73fc0606aaa6602b9ebc524809c9ba3501f' dependency_hashes['requests-2.31.0.tar.gz']='ce50d64973752f4cf7f7c7c91401669854b55c66d7465bea3689772fae8a6b646cf6720d84a2984bbe6fd78fc8b9ce0aa377f291fb6d7c20c7c2a4be8193acdd' -dependency_hashes['setuptools-69.2.0-py3-none-any.whl']='fa6b2927b16c00a30b135373be399cfec7ab1b0e9b410de6502172d50ba2a191214a4a4adb443d362198d43e86a662565155ea4c8d37f3305e9f7d1aef724b25' -dependency_hashes['setuptools-69.2.0.tar.gz']='e69abe573304b1c2c074144c9df663fec0d6ce617359f070ca8d57710e4beb99435d0d2124d45a7d8b24889693597e1e03875bc6ff960fa31f6250e1c253b906' +dependency_hashes['setuptools-69.5.1-py3-none-any.whl']='d212edd21ab99f50c2daf6080c68a3cc0eeed566f10e91f857e7eeb86513f33e9cde25b975db1030110c3b1714cfbfd4d3c9e2937b4a5ff2bb8971e605ecee85' +dependency_hashes['setuptools-69.5.1.tar.gz']='81f4a5184976a0d4aa070261bb56458c54ec6a479786fa469e98cb336e9a1691b281ae771abe41bc5398fac15b2dd039c07cf014ee00572f46908ce6830fcb6a' dependency_hashes['stem-1.8.2.tar.gz']='f054bbc9a61e04fb7e3b7d1534803b938b855c29795471953661f8fd9c0a5196fe1f9ccfd01e5b3256ea42893a7d57fda34fa54932012e345f74bb3303ff98c5' -dependency_hashes['typing_extensions-4.10.0-py3-none-any.whl']='f3056ce051ebf092ce1e7a88753b8cbbb2be0bbb6ae18118a9cc900fe42052f2a0b3a99c6a75806ec3173c0b0618df356a60108af6979744d202a50a0d22cc48' -dependency_hashes['typing_extensions-4.10.0.tar.gz']='d3d840719ed0cf1435a959f84a65df93f55fb4bfdda926cd74a34a8bb6ab0407108ee8941f40b6cb570e2f7c440abffb0bc1d0f0414814047de6e9c3eeb24093' +dependency_hashes['typing_extensions-4.11.0-py3-none-any.whl']='b169d8dcb01948fa08f4f85d2e224d285e47710b6f2e3924340ad01f26c7ef68588c571b8f6a0fbc6955dae46950420d046057bbba82c26d30de0554494206a4' +dependency_hashes['typing_extensions-4.11.0.tar.gz']='d795fadbe9c0a24c4d3190f375d72576f5b42a14dc3a999127c1356f2ae77d4bffdc04a23b7a05331cc8b703a81f504328aaf5d6c1247ea24cbeed25dccb0a37' dependency_hashes['urllib3-2.2.1-py3-none-any.whl']='82525e89629af701c2ce44ed6766c3b4c1f7b57ce0a3418342849dd4c13802b901b0942e7199d6e268ae03a14b67bc023bdc66fd827f4f50a3c4895271245c9d' dependency_hashes['urllib3-2.2.1.tar.gz']='dfadba099db678ee1567ee95aa11a72fcea0a76df094d04dd4bd7ed5df4ea2fda6917cc122a1e2bfa4f5303916f93a7e1c881fbbf3cbb9415a25bd7eca1b14b3' dependency_hashes['werkzeug-3.0.2-py3-none-any.whl']='8904c195547630ef173356c8286deb5fa9140f193ea017680b9ea67a57db4d4c7479fe9023f02f78882a5212bf8e79240d994b13322d8a7cb6e4348b6b69b760' @@ -202,7 +202,7 @@ function compare_digest { function verify_tcb_requirements_files { # To minimize the time TCB installer configuration stays online, # only the requirements.txt file is authenticated between downloads. - compare_digest 63e1b3a74dcc8b996502e0f489b5d682255e0608707bce1215716a7b65b8951feb30c4f3cbd82ec1cf01f773a20abb5aaec221852505eb1920609e49ea5dbbb2 '' requirements.txt + compare_digest ad8cd3eac919da8be4c732c44f31ab3a54c85c1f73fc9c3fc130be69ca7c566e69a9f207511d6ec32ef7957b1e70953996d7e250cfbc54f3cb35d991ff12e5b0 '' requirements.txt } @@ -212,8 +212,8 @@ function verify_files { compare_digest 74915e048cf8b5207abf603136e7d5fcf5b8ad512cce78a2ebe3c88fc3150155893bf9824e6ed6a86414bbe4511a6bd4a42e8ec643c63353dc8eea4a44a021cd '' LICENSE compare_digest da5fad3d2dfcb2bb992df4af9ce5c7a792b489cf9f86f966610c2d5933536a8ff9f1be2ec2bf2cbc3eab46cd469ffba35a739eacd31dadb704a28f14cd75cefa '' LICENSE-3RD-PARTY compare_digest 55b954740233846aaed4360b5ec39e5fd52c3050541b221013fd62fe66e65f21c3ef3527dc97f3db1013a26768a9f2cc1400bf84bf4b26bb18f79c00e1f500f5 '' relay.py - compare_digest 6930acb2fe76242d2037795ca3721e8fe6b49a82059fc8f53f9f9492a81a1e1e6a608437835c07dda485b7cfa8a57557032fa881246ab0cd4152a295b651b642 '' requirements-dev.txt - compare_digest f061f75177b08103f5bf835dd31f06f3db0b57374635ec51f4eb999dffc1737766e19bbb5ffed4a475596d9a26b10ed171d01e7d06889075e447672701d886f7 '' requirements-relay.txt + compare_digest 081ed4287b3095c1a15b05c52a474b47473d891af28678105a8938c3291bfd37f910fcd6f6766e0f488ac2771501fa1846c1617c24ca45481fe28fcd6d87a9a1 '' requirements-dev.txt + compare_digest 46318d974472c8d19a35c0f8173c0226d00a81b96fdd500f2cf10c92606deba0949ef52a7e9981c8254c7097dfa301857bfe87e838a838c17199d480d851cfff '' requirements-relay.txt compare_digest 0e66cb8609a0f9abc9ca0f76298593a076cd5c8b85abaa0d8b3b765d40a2599a4ea2d33fb4792a97dc5ceee3b71e1682715f71555d5502c87ea20da922d05a7f '' tfc.png compare_digest 14bbec9fce50ea69082724347d075ed81685b982743384a9690d7c95ae5c1655a35d01ec5b4d8e4ffeee91c37ef0e2c7ca3d79ea8578abb7c87c22b5d9fb9928 '' tfc.py compare_digest 356ef5005cd095c219608255b1ca61365d32ce246c0eea4bd5c565c5a4730e1e9dd0c56b85e5ba9923271db99cd5ae430480d70fbf7e23ab26b362aaaedb3103 '' tfc.yml diff --git a/install.sh.asc b/install.sh.asc index 97f5575..99db67c 100644 --- a/install.sh.asc +++ b/install.sh.asc @@ -1,16 +1,16 @@ -----BEGIN PGP SIGNATURE----- -iQIzBAABCgAdFiEEbab1Q2VetFRTHbYIAsu63k/6kOYFAmYMgo0ACgkQAsu63k/6 -kOaAjRAAsOvZwKVxk8Q8AdgVc8Y11hmPknHwq5Lo8UKLl5Eb7nHJGjzsYoI1qKkP -ygtD4WJfhA/PFGyKqpaHjFmq6Ikgs4u0Rlnsr7Qjxcf+8gfXOGd/rrLGVKfqHCl1 -//4cBPJ6/YrQ6mcPwUPUR+llnj7t8bI3LGax4yEb2pnWO6sBI8B3Yj9YWp3z0e2a -0NIv/hAlW8xVlO8gfl03zISgRxf3mFgb4epJ3AO02JeiVds3cUq4umXHVcr7Ju4z -JAfjTxkHLucyhBUeTVghzkUkOrDC53LI8ss0O2vwD59jj7p4PQhW4i1Tt7v4wrZq -ZNR9oKjuaPHf1ZSpEvliJjv/sh5nVyCdeDrlWbiwvCgqs9PxvIFAeIDZqwZvfXKt -h2CFfmYs3t5je6t+tKiIXTmjgayhrO+asz4yGV/L1EdsAnhPR6U2UT6gUJmL4I7z -diBElE/m+P82dvoM4vGucWtTr3lHVbSSr8YH6FrwRqN1RsgbSYsxnAaOz74HXBkF -inKSOIA2kfCiDa+09MMApi2ZWQHEtbV0aBmchk5CUth7Hb6BBknO6kS2ZhhXbXzu -4U07hb9PZWKkbN0Ec6GCuiETWT46woPiSw5oRFxinHxY3Lg/pYMnItNkKsX7pjVK -fejfSQ6l8TTih89qCJlrCVcvegoO0JkApSPepWUUZZjosrqZ/fY= -=+C5b +iQIzBAABCgAdFiEEbab1Q2VetFRTHbYIAsu63k/6kOYFAmYieRQACgkQAsu63k/6 +kOZDKxAAiqAxeeagyXtIX17BW3nAfq9O58kFNisuNhTJuw78S1uPYLJMsG2pqpON +I5YXukd/Hm6H+lD9CpLvRm/+HKv2ppmanzy+G41l2kZoJk8y/tENOYtbh1OnB56D +U2c+6g7enKyS6gnY4wM6Xz5ue4MZdUPoI6w/THZBrhAQbtvbXos+jc/KFGGd7wX3 +/lwvQObE55QTGBzCbA3YBpJEoTuz/ZTytYnROquKSDre9BxK+69WSWfa0icQcu+i +khRqAOgSya7IER7o8mEwP0uM9TeIGUQYJtYvLWqUpH/UE5CILR0rvz9ueH0KRwa2 +Zi+ibTRWPdNk4tvKEq2Dk3T0xS+VHBaXwgG9hPm85bL61gkigrPgbEBUCYO5aYF6 +8JQJZI5n7hK9910SjegifyzJ1x1DOKgH4f0PnNmKb+x7SWae17kv2wuBm07NdlwM +9YJCs0YOe9TlL1NhLpPr/R0gWy2MBgGMk4BYJDHcRpjuqBdhw/E+idWx5p50gvQd ++p3y30kgPNjwNsajiupC/2HCBZHrz/V32GPVotfQnjrsPF0eANmm+l4vL3ZyyOdK +f47PggMQdCY9UaNF/ncy/X9MM5ZQUiIvf1tAaS3tsoiJujgZ6KzYWsJZz+UsV9DZ ++QTxKcgTJY0R/Vc6QPnjeL45ZE/knu0gb1yYp1fNqYcny90z8Ig= +=2z0y -----END PGP SIGNATURE----- diff --git a/release_automation.sh b/release_automation.sh index 0f4cc86..81643db 100644 --- a/release_automation.sh +++ b/release_automation.sh @@ -201,13 +201,13 @@ function main() { # DL Actions # install_global_dependencies # update_ide_venv - # update_dependencies - # test_requirement_files_with_pinned_hashes + update_dependencies + test_requirement_files_with_pinned_hashes # Actions - #run_mypy_type_checks - #run_style_checks - #run_unit_tests + run_mypy_type_checks + run_style_checks + run_unit_tests update_installer_digests run_release_checks diff --git a/requirements-dev.txt b/requirements-dev.txt index 05f0223..c857c4f 100755 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -10,10 +10,10 @@ pycparser>=2.22 cryptography>=42.0.5 # Flask (Onion Service web server that serves TFC public keys and ciphertexts to contacts) -Flask>=3.0.2 +Flask>=3.0.3 blinker>=1.7.0 click>=8.1.7 -itsdangerous>=2.1.2 +itsdangerous>=2.2.0 Jinja2>=3.1.3 MarkupSafe>=2.1.5 Werkzeug>=3.0.2 @@ -21,7 +21,7 @@ Werkzeug>=3.0.2 # mypy (Static type checking tool) mypy>=1.9.0 mypy-extensions>=1.0.0 -typing-extensions>=4.10.0 +typing-extensions>=4.11.0 # PyLama (Code audit tool for Python) pylama>=8.4.1 @@ -52,15 +52,15 @@ coverage>=7.4.4 # xdist (Pytest distributed testing plugin) pytest-xdist>=3.5.0 -execnet>=2.0.2 +execnet>=2.1.1 # Requests (Connects to the contact's Tor Onion Service) requests>=2.31.0 certifi>=2024.2.2 charset-normalizer==2.1.1 -idna>=3.6 +idna>=3.7 urllib3>=2.2.1 -setuptools>=69.2.0 +setuptools>=69.5.1 # Stem (Connects to Tor and manages Onion Services) stem>=1.8.2 diff --git a/requirements-relay.txt b/requirements-relay.txt index d483af7..0b3b875 100755 --- a/requirements-relay.txt +++ b/requirements-relay.txt @@ -19,20 +19,20 @@ certifi==2024.2.2 --hash=sha512:7a3bd4849f95e1715fe2e99613df70a0fedd --hash=sha512:2191710dc2cfdf781df498c3ecd5f38dfc5215e2c2dc402cdcd484376dbd7fe2e442793cc856e93f6033c1fc43cb77c71d2dc785dbfe0d8cd10fd3120ee3c2fd charset-normalizer==2.1.1 --hash=sha512:fe2f3ae5d3c011b314a057456a7b13ba957593b22dbe7f532f9fbe077103e75b3f8b631fb1e2a4d5875a60af678b6779780eff7df0ea7c08144aa88fce34abc0 \ --hash=sha512:f52abab683ebda4100d67ec6ee0349713baee453a742d60a1356f405c5ce2c3b4d850b0891527f08f92fa1217d59c46d6b181dc4ff1b962ce60d9c5ef8c913d1 -idna==3.6 --hash=sha512:0ec1ae5c928b4a0001a254c8598b746049406e1eed720bfafa94d4474078eff76bf6e032124e2d4df4619052836523af36162443c6d746487b387d2e3476e691 \ - --hash=sha512:8bea880d1b2fae1511f21381d73445f62e786c385eb949d2c39e611f71cb6f31f7e54927833a0f456e340857d384d960ab9e6ae31ac7481314254646de656cc0 +idna==3.7 --hash=sha512:488a437198bcf2d32098d99a71447a514212d28e6149d597a347d85b638d9c1b8a328cf190f2b7872a7869f157160754f560fdbca2f2a9ba035401f0eaa9a87d \ + --hash=sha512:b50e5ae117b67c7076125d6943e3436200676f85d7dd1b5a5414e217e73904ef077f0b1108d9781ab4afe2a66f7c9e1ce8262ce51edeb2d29e4c504147b6c4cc urllib3==2.2.1 --hash=sha512:82525e89629af701c2ce44ed6766c3b4c1f7b57ce0a3418342849dd4c13802b901b0942e7199d6e268ae03a14b67bc023bdc66fd827f4f50a3c4895271245c9d \ --hash=sha512:dfadba099db678ee1567ee95aa11a72fcea0a76df094d04dd4bd7ed5df4ea2fda6917cc122a1e2bfa4f5303916f93a7e1c881fbbf3cbb9415a25bd7eca1b14b3 # Flask (Onion Service web server that serves TFC public keys and ciphertexts to contacts) -Flask==3.0.2 --hash=sha512:c817a1518315f0e9c733b0c08c66dcb95191029bfea649455f7e707a59f3f9104132962d498f408b4016e49dac634ffd9361c11039b6b85741b2c0b35cf38e54 \ - --hash=sha512:02f937dae7d654f6286eb9fcf2d68d83f3ef56dbc4d59a961ea1bd95d17fac7a5ace3f27ebb03ff0592f6a87361e59934ffda098714fc8a049a487d4c0bbc0ef +Flask==3.0.3 --hash=sha512:efc6990982567332f1d274054a5d2f1e1b78c21f25a4cfb1de6b3a2f96fceab33fb0d31f9eb28f504e3899742fddf5854ee357395e7b66fdd3810eb64b8dff93 \ + --hash=sha512:977c0e5fd2d496fae8e34a035f211118642dc6518a14dc5f6c175b72c6a76407aeb9ff0ed1f5db636370a9aa7e0d36baa783713ea7bdabd7f28c8c2b94643cd1 blinker==1.7.0 --hash=sha512:d7a15c140abe1ae1aab65d215748c2cab3f80c33ea31e3b5d7b3c44cd8d121b5084fe081e875e72f7cdfb85af987153288f55dc2ca0ee776dc93059fbb84df29 \ --hash=sha512:b55dc104fd69bf9f682184202f9da7cb6925e7e863f38d5ad5b4b5988b2315aae02da6f4c9f0ec34238b8d5b9b6eec52b06258d93e14416cda3e2b718d9aa60c click==8.1.7 --hash=sha512:687ea8c461196b234b0f0db0638ba213304b96bdeb9c9c6334a6cbd78f4e99da9e062bca2f449c88fd7a1de7ea2643e80c8ea571103dd4b2c50424a6fbd5d5e0 \ --hash=sha512:c67146ad0112daf8ed4db62a6b0a0065109332eb8fa31962ce40d61e27e2736020a0cadfebdd1656e2f23c20291b069d3a409faffe999a0907e6dbdef77aa014 -itsdangerous==2.1.2 --hash=sha512:190df7f250b5e5985898a7f0e0e9d4c3d0b5c391268b9b5ad0f39667ec887b543651dff7623ba49e191ffadb42b0354b21be19ef61a1f68193924bf12034dd1d \ - --hash=sha512:e4d870a33992b309ed778f403c0c1e098983a693d1165260748bf36385ebfadb583811e05ddd48001a33cf6a4e963b7dd8a8c68919c5b4b86f63621d8869e259 +itsdangerous==2.2.0 --hash=sha512:3c9d38d4a9a53f6426139969a111cb13f0588e4445173542a5c88a2f85348afc6f709f3523a4169eee6010cec99eed6df3a82cac59ca96a731d39461f88e2b83 \ + --hash=sha512:ed046cc371ea9aa1f7cd3bd201f1b68910a2b008bd8434c425332cecec6539cf031df6e2223a1fdccd68c12ccf5486e80f178d5906911b19417f0ea244e367f8 Jinja2==3.1.3 --hash=sha512:e3e2e6bd511dec484dd0292f4c46c55c88a885eabf15413d53edea2dd4a4dbae1571735b9424f78c0cd7f1082476a8259f31fd3f63990f726175470f636df2b3 \ --hash=sha512:5c36d0cd094b40626511f30c561176c095c49ef4066c2752a9edc3e6feb2430dafa866c17deebddcd0168aa1f0fd3944916d592c5c999639b8152e7c1009c700 MarkupSafe==2.1.5 --hash=sha512:f32cc6753cfaedeae6392e1f7fc8523ccbbdd996fa10636164004dba3d0d3ed80b8cccb1de3f6660c3114e8f83c260b7f92238b0a2a0bc48580ae00f4fb1f964 \ @@ -141,8 +141,8 @@ PyNaCl==1.5.0 --hash=sha512:853446c38ce5488e18eba166f67650bc4f50 --hash=sha512:61e07a421705e5c1613cbc888ff594d7e3457090e9654280f2b6e54a84e5d6dcd56292fd3c47b86a59be6eecafa8f17ad5d710f45b7fcda9f57d9c7343328bc2 \ --hash=sha512:9720cfe64e70667804c197a1762db2985bf5893ae774418f50da9a3d31135b8935fd497c5fe4f92909f6e0ac70e3c5dd57f6322ab780d29b12741c64c0d2c007 \ --hash=sha512:cea3e4556432588630382abae6debf9203c7f55da286509da547a7921e4dbad98c915743625c68e5f7187fcaf6d4cdaf7ed2ed3ba60bd4c10ae6e3f88608dc65 -setuptools==69.2.0 --hash=sha512:fa6b2927b16c00a30b135373be399cfec7ab1b0e9b410de6502172d50ba2a191214a4a4adb443d362198d43e86a662565155ea4c8d37f3305e9f7d1aef724b25 \ - --hash=sha512:e69abe573304b1c2c074144c9df663fec0d6ce617359f070ca8d57710e4beb99435d0d2124d45a7d8b24889693597e1e03875bc6ff960fa31f6250e1c253b906 +setuptools==69.5.1 --hash=sha512:d212edd21ab99f50c2daf6080c68a3cc0eeed566f10e91f857e7eeb86513f33e9cde25b975db1030110c3b1714cfbfd4d3c9e2937b4a5ff2bb8971e605ecee85 \ + --hash=sha512:81f4a5184976a0d4aa070261bb56458c54ec6a479786fa469e98cb336e9a1691b281ae771abe41bc5398fac15b2dd039c07cf014ee00572f46908ce6830fcb6a # Argon2 Password Hashing Function (Not needed but allows importing from src.common.crypto) argon2-cffi==23.1.0 --hash=sha512:f0d80298b5617e8ed7ae7442f582caeeb3a5450562af18df4d7b5bd7395cfa99597f5ba31128d3105ee498e6661a50fa34602df374103ea523a2d7e832d7b7d6 \ diff --git a/requirements.txt b/requirements.txt index 42ef4f2..7274996 100755 --- a/requirements.txt +++ b/requirements.txt @@ -87,5 +87,5 @@ PyNaCl==1.5.0 --hash=sha512:853446c38ce5488e18eba166f67650bc4f50 --hash=sha512:61e07a421705e5c1613cbc888ff594d7e3457090e9654280f2b6e54a84e5d6dcd56292fd3c47b86a59be6eecafa8f17ad5d710f45b7fcda9f57d9c7343328bc2 \ --hash=sha512:9720cfe64e70667804c197a1762db2985bf5893ae774418f50da9a3d31135b8935fd497c5fe4f92909f6e0ac70e3c5dd57f6322ab780d29b12741c64c0d2c007 \ --hash=sha512:cea3e4556432588630382abae6debf9203c7f55da286509da547a7921e4dbad98c915743625c68e5f7187fcaf6d4cdaf7ed2ed3ba60bd4c10ae6e3f88608dc65 -setuptools==69.2.0 --hash=sha512:fa6b2927b16c00a30b135373be399cfec7ab1b0e9b410de6502172d50ba2a191214a4a4adb443d362198d43e86a662565155ea4c8d37f3305e9f7d1aef724b25 \ - --hash=sha512:e69abe573304b1c2c074144c9df663fec0d6ce617359f070ca8d57710e4beb99435d0d2124d45a7d8b24889693597e1e03875bc6ff960fa31f6250e1c253b906 +setuptools==69.5.1 --hash=sha512:d212edd21ab99f50c2daf6080c68a3cc0eeed566f10e91f857e7eeb86513f33e9cde25b975db1030110c3b1714cfbfd4d3c9e2937b4a5ff2bb8971e605ecee85 \ + --hash=sha512:81f4a5184976a0d4aa070261bb56458c54ec6a479786fa469e98cb336e9a1691b281ae771abe41bc5398fac15b2dd039c07cf014ee00572f46908ce6830fcb6a diff --git a/tests/receiver/test_key_exchanges.py b/tests/receiver/test_key_exchanges.py index adceb9f..2f1dc43 100755 --- a/tests/receiver/test_key_exchanges.py +++ b/tests/receiver/test_key_exchanges.py @@ -30,8 +30,7 @@ from unittest.mock import MagicMock from typing import Any -from src.common.crypto import encrypt_and_sign -from src.common.crypto_phf import argon2_kdf +from src.common.crypto import argon2_kdf, encrypt_and_sign from src.common.encoding import b58encode, str_to_bytes from src.common.exceptions import SoftError from src.common.statics import (ARGON2_SALT_LENGTH, BOLD_ON, CLEAR_ENTIRE_SCREEN, CONFIRM_CODE_LENGTH,