From 36b57c995ae81a76cfa6547e0bbab98b1c8cd7b3 Mon Sep 17 00:00:00 2001
From: Markus Ottela <oottela@cs.helsinki.fi>
Date: Tue, 2 Apr 2024 21:04:50 +0300
Subject: [PATCH] Fix Tor control port number for Tails and onion-grater
 profile.

---
 install.sh                     |  6 +++---
 install.sh.asc                 | 26 +++++++++++++-------------
 launchers/TFC-RP-Tails.desktop |  4 ++--
 src/common/statics.py          |  2 +-
 tfc.yml                        |  2 +-
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/install.sh b/install.sh
index e99040c..27ac941 100644
--- a/install.sh
+++ b/install.sh
@@ -216,7 +216,7 @@ function verify_files {
     compare_digest f061f75177b08103f5bf835dd31f06f3db0b57374635ec51f4eb999dffc1737766e19bbb5ffed4a475596d9a26b10ed171d01e7d06889075e447672701d886f7 '' requirements-relay.txt
     compare_digest 0e66cb8609a0f9abc9ca0f76298593a076cd5c8b85abaa0d8b3b765d40a2599a4ea2d33fb4792a97dc5ceee3b71e1682715f71555d5502c87ea20da922d05a7f '' tfc.png
     compare_digest 14bbec9fce50ea69082724347d075ed81685b982743384a9690d7c95ae5c1655a35d01ec5b4d8e4ffeee91c37ef0e2c7ca3d79ea8578abb7c87c22b5d9fb9928 '' tfc.py
-    compare_digest f9600e3e31075a53e009cec13474399f5553517f62fa2bcf9048987e47a5eb1b1c2443eadf14aea5ec7f4e67f4caa08809bc11ec8984a184a8c249bde1d2688a '' tfc.yml
+    compare_digest 356ef5005cd095c219608255b1ca61365d32ce246c0eea4bd5c565c5a4730e1e9dd0c56b85e5ba9923271db99cd5ae430480d70fbf7e23ab26b362aaaedb3103 '' tfc.yml
     compare_digest 71999fc9fa70313af601e5b7a41cc21f756af9f7f79eaea5ba47a07a8f8c8ca2951bd6cf5fdba8a55604f15e83e26ffda12b71fd2db4dc1916433243471aa164 '' uninstall.sh
 
     compare_digest fe5b9289761661f1440f97d4f64b4f969842ef4ed3dcc6951ce7e5fbe71f986f5058e7fe4815e0e6b0bca9b644b95d147a2e77d367ebfec8df2733d22ed38bec launchers/ terminator-config-local-test
@@ -226,7 +226,7 @@ function verify_files {
     compare_digest e3b1a1ecac9fccdc4a708351fd71fd0897621446df13fde0e2ebc34d4704d945dcfdd256af1cec92d6ebe6c5497bce3db98d052f8885db8e579345769e5fe758 launchers/ tfc-qubes-transmitter
     compare_digest 2cb288015524281c001c2090c952a607a984568f8d62146a5e7bc4ba8cc8e4105fb411324cc8806a05ad99b501d9585bbded43b5ad8762db698ea6ef7681e1ef launchers/ TFC-RP.desktop
     compare_digest 6bb0b26d0f9cd800fae0a1cdd13c48bb030fa9141591d5f8dde02b55693b47213e1989095f4187f286f515314b50ee25c90364a4dad7099b6bf15cf39cbeb183 launchers/ TFC-RP-Qubes.desktop
-    compare_digest 93cce601b7f13b80848d7432262df6aabfca24291da0a465315cd36ffef05486c9e013b4b553835cdecf311c0dffa75d3935fbe2fe7d53c10a8f07d778e0ed9a launchers/ TFC-RP-Tails.desktop
+    compare_digest f1cdc9d5b3610686a3be43b9fd050521e16780fa59b914036eb90ebbc027bc0bfcea3c38b84b3fe2f5cd63fdcebae18854606ad4cfe27a34c1e2aac95baa9c26 launchers/ TFC-RP-Tails.desktop
     compare_digest 228e401ac0fe9a20125cc8a6370daf61c81da0ef24216eaca7364777a373559d170a6f27757814ff31b6856c02e37a5e004e03875d9688f76cc3f97bac5c581d launchers/ TFC-RxP.desktop
     compare_digest fb9fcb15ba4853cd07b61566e071dfca68a61de717ca29765e472cbbbc08215fde967e83e5744f7c29af3a45a4a4c5c6f18eab0076dab08eec3516455eb0b8b6 launchers/ TFC-RxP-Qubes.desktop
     compare_digest 1db227da47e7e818461b3ada5318d08e963ce55287d12d0239ad19f0746c43d8b1b3339b810e5048af48868e69dd8722976f01e981ee39240ff613cc2470ff31 launchers/ TFC-TxP.desktop
@@ -254,7 +254,7 @@ function verify_files {
     compare_digest 776b60201db1ccfa593015b9c4e5877adf0c184cc5f41b22e2d3dd54106b01a2f9e817493283c58c416d0d28081bc94f2fe7db9f336cfec2f65e40a85c4d326e src/common/ output.py
     compare_digest f1805ae899c94c80aaaadc7fedb03e09525288542f96cc660ac4bb1da5be4c123bc068cd426c529b99c679e4a1e9a63ac0a8c2eca964af9bcd3a0bfdc8da398e src/common/ path.py
     compare_digest 0cf08cbd61b1be94142414c03f6931df7c06ff944f150855bb52b13abd8f1dd29506be041cd4b77eb83a2c4617702b4dbad3e9a5097256c36b1d444f20ccb4da src/common/ reed_solomon.py
-    compare_digest 11fe313775212724a8a2c446414425b6ffe226a7ee585bb70b5e4740201afa09abc84d1cfe63742c4f1fb55ad827a7642776d55c1082dae045263fcc21fb6df2 src/common/ statics.py
+    compare_digest cbb72e8ce58a7bde532aed54260be4ecd421d973f942f56c98539ba6c957c4dad094bd3ce2793324f3fd25375491e5b313786f2ead9dc93a06e88588b043f061 src/common/ statics.py
     compare_digest ba0e77bffa8243ea13565664133e433bf72925d5ddd5c6e599dd24e58c0728aa55f496db06d25fba0d3050aea4163d1b6bc81d1b8fb75e48bace43845e83df70 src/common/ word_list.py
 
     compare_digest 90218be097758a94ed60189393756682fa84cac0c025bd9c3c1f26bf21357800398ac505eb9f4b0f565ff3cfe52c48a0463a939a60e1e197a674d88cda314583 src/receiver/ __init__.py
diff --git a/install.sh.asc b/install.sh.asc
index bcf9369..e772e25 100644
--- a/install.sh.asc
+++ b/install.sh.asc
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAABCgAdFiEEbab1Q2VetFRTHbYIAsu63k/6kOYFAmYMJXMACgkQAsu63k/6
-kOZFwxAA2ZhofP/id4wqM02zceJlsr9xDuJo8Mx/Syn//S75tCnfmuB6NKVcgSN0
-7R/RYtyNAwLQRyraBvln334PgNX24KhGJ8j1yyMvabQ26K9NHthe8e5mbj/ozepY
-yxcfuExV8B0ImZ7AMx3/Rj8GUJdtDZyHOrmY09HNmtc9C8u1ZpZdCEpmBesjF7Tz
-r2xGKCbUhGgFkV+D71u4cyx1JQVp5JqfDDZ/W1ANJSlWRaLigQfRb4g5ruqzJ7S4
-gDpr9uLLGqjbZ4lMkrFyOBg3NUIqLGXVdRgJhSj+XZ5NVVSA4CNTyt4V/LfKCEon
-kXxyJMH1pyz6mm07lHTv1GkWAiH5Zbd9oEgGxnaW93Vyq+UHjvXJDVmHssFBJvNP
-AlTzK+/TgWpxoEEYKfxzsc94g+aHWi5Q+AFa5JFV9VlOXgtxJv1n0yHz0gEiRq3/
-iPEdx62LcE1NmxkDC5cYPnXjAb5jEsf0tDEf2BaKtsWyq/IX7LJT5YHYrEVYFhEL
-FDFe+e1JM9vQJBjZ8guainpkC+GnyD0PrjV+tocyKJjB0moCyJZmFeuue2gukyS3
-394bTYUbD/XPbkZtKYG19V0f8R/TQOu2f65V1bBW1rDHwnwVO/6F2ICd+YFw9WT5
-8xnN1uCepFpNQtxNmc4tPqblCS5ES5gbRFI3ensR2t0/IoWEMeg=
-=HJ0h
+iQIzBAABCgAdFiEEbab1Q2VetFRTHbYIAsu63k/6kOYFAmYMSLkACgkQAsu63k/6
+kOY49Q/+NUk1udGgYafBhCweziB0ayFE9iVeVeNg+D8QTMN7UGSUr9sejkrMD40+
+kIc1Z6fkXgbHtevlzbJvXfscEb4LYGEi3NKc5demhbf4NH1UrZJQH39YURcLs+bJ
+O292F2HSEOKPftZGHE6CmZbh7NvMh2uTq4+NpdNiTw0KiVUQNp2F2d3gg+9sHf4o
+ID4ZeHggWEGMKqi96Ro8C0YX55f5gm+JtvbmyD+oPlk8wSGa19ynrpBmMW8PpT4g
+Ivv+D7rXh+rBvTN901rpF0yehu3JAcNEqqZIMsf6NVok5c7Jfj2yKqeVv18H6fAb
+ZHN1T3cLYwftQZp9TAU1XZ4yYYS2WjXtz5aYYdk/HXN3YaLGs3cYUsRGvg0q98qK
+Qhz3+9mqgeLJVyl2QAIkjRMnCRx+Ux7760F+/FC/bQedK+JZoFc2gfTUtpbBQ5Io
+Bxk44gN1qmoRP0F1uTnmGb5X0ZWUFhgfxGyC944LJqABErzu8quu++nND5MCEDvg
+vcuO+wpT8Oe9VWaq+CHxWz//h4jOq2dT7f4GqCXd/UHfdx1ym6LeqHIVMTT5k+pG
+zTM84gy4WDy1auk4AG7rZIqbUAK8VVU/oMZQAx1dveb7uvUVuLGew0C3YxoegCVQ
+CEshJpbDB0QQLh3MHJU20mtWzMwWZviCUG51lvFN9sq0fEiW1cU=
+=Lr+b
 -----END PGP SIGNATURE-----
diff --git a/launchers/TFC-RP-Tails.desktop b/launchers/TFC-RP-Tails.desktop
index e85426f..7b80579 100755
--- a/launchers/TFC-RP-Tails.desktop
+++ b/launchers/TFC-RP-Tails.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=1.24.04
 Name=TFC-Relay
-Exec=gnome-terminal --geometry=105x25 -x bash -c "python3 '/opt/tfc/relay.py' && deactivate || bash"
+Exec=gnome-terminal --geometry=105x25 -x bash -c "/usr/bin/python3.11 '/opt/tfc/relay.py' && deactivate || bash"
 Icon=tfc.png
 Terminal=false
 Type=Application
@@ -10,5 +10,5 @@ Actions=Launch-Test
 
 [Desktop Action Launch-Test]
 Name=Launch-Test
-Exec=gnome-terminal --geometry=105x25 -x bash -c "python3 '/opt/tfc/relay.py' -t && deactivate || bash"
+Exec=gnome-terminal --geometry=105x25 -x bash -c "/usr/bin/python3.11 '/opt/tfc/relay.py' -t && deactivate || bash"
 OnlyShowIn=Unity;
diff --git a/src/common/statics.py b/src/common/statics.py
index 0773830..ab5f950 100755
--- a/src/common/statics.py
+++ b/src/common/statics.py
@@ -542,7 +542,7 @@
 MAX_INT              = 2 ** 64 - 1
 B58_CHECKSUM_LENGTH  = 4
 TRUNC_ADDRESS_LENGTH = 5
-TOR_CONTROL_PORT     = 9051
+TOR_CONTROL_PORT     = 951
 TOR_SOCKS_PORT       = 9050
 DB_WRITE_RETRY_LIMIT = 10
 ACCOUNT_RATIO_LIMIT  = 0.75
diff --git a/tfc.yml b/tfc.yml
index 25595db..fe16766 100644
--- a/tfc.yml
+++ b/tfc.yml
@@ -1,6 +1,6 @@
 ---
 - apparmor-profiles:
-    - '/opt/tfc/venv_relay/bin/python3.11'
+    - '/usr/bin/python3.11'
   users:
     - 'amnesia'
   commands: