From 17fce20ee36021499f476dd4a52799daeedb310b Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 2 Jul 2018 17:03:30 +0100
Subject: [PATCH] torsocks rather than torify
---
src/freedombone-controlpanel-user | 16 ++++++++--------
src/freedombone-sec | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/freedombone-controlpanel-user b/src/freedombone-controlpanel-user
index b622b35da..1b2884971 100755
--- a/src/freedombone-controlpanel-user
+++ b/src/freedombone-controlpanel-user
@@ -295,7 +295,7 @@ function gpg_set_trust {
fi
if echo -e "trust\\n${TRUST_LEVEL}\\ny\\nsave\\n" | gpg --command-fd 0 --edit-key "$fpr"; then
- torify gpg --update-trustdb
+ torsocks gpg --update-trustdb
dialog --title $"Trust a PGP/GPG key or website domain" \
--backtitle $"Freedombone User Control Panel" \
--msgbox $"$TRUST_ADDRESS was set to trust level ${TRUST_LEVEL}" 6 50
@@ -454,9 +454,9 @@ function show_full_gpg_key {
}
function publish_gpg_key {
- torify gpg --send-key "$GPG_ID"
+ torsocks gpg --send-key "$GPG_ID"
if [ "$GPG_BACKUP_ID" ]; then
- torify gpg --send-key "$GPG_BACKUP_ID"
+ torsocks gpg --send-key "$GPG_BACKUP_ID"
fi
dialog --title $"Publish your PGP/GPG key" \
--msgbox $"Your key has now been published" 6 40
@@ -500,7 +500,7 @@ function add_gpg_key {
--backtitle $"Freedombone User Control Panel" \
--msgbox $"GPG public key was imported" 6 50
else
- torify gpg --search-keys "$ADD_EMAIL_ADDRESS"
+ torsocks gpg --search-keys "$ADD_EMAIL_ADDRESS"
gpg_set_trust "$ADD_EMAIL_ADDRESS"
fi
else
@@ -686,11 +686,11 @@ function sign_gpg_key {
SIGN_ADDRESS=$(<"$data")
if [ ${#SIGN_ADDRESS} -gt 2 ]; then
clear
- torify gpg --search "$SIGN_ADDRESS"
+ torsocks gpg --search "$SIGN_ADDRESS"
fpr=$(gpg --with-colons --fingerprint "$SIGN_ADDRESS" | grep fpr | head -n 1 | awk -F ':' '{print $10}')
if [ ${#fpr} -gt 2 ]; then
- if torify gpg --sign-key "$fpr"; then
- torify gpg --update-trustdb
+ if torsocks gpg --sign-key "$fpr"; then
+ torsocks gpg --update-trustdb
dialog --title $"Sign a PGP/GPG key" \
--backtitle $"Freedombone User Control Panel" \
--msgbox $"$SIGN_ADDRESS was signed" 6 50
@@ -714,7 +714,7 @@ function gpg_key_trust {
TRUST_ADDRESS=$(<"$data")
if [ ${#TRUST_ADDRESS} -gt 2 ]; then
clear
- torify gpg --search "$TRUST_ADDRESS"
+ torsocks gpg --search "$TRUST_ADDRESS"
gpg_set_trust "$TRUST_ADDRESS"
fi
;;
diff --git a/src/freedombone-sec b/src/freedombone-sec
index 203bd4b91..6bfcc01ea 100755
--- a/src/freedombone-sec
+++ b/src/freedombone-sec
@@ -1518,8 +1518,8 @@ function monkeysphere_sign_server_keys {
if [ ${#line} -gt 2 ]; then
fpr=$(gpg --with-colons --fingerprint "$line" | grep fpr | head -n 1 | awk -F ':' '{print $10}')
if [ ${#fpr} -gt 2 ]; then
- if torify gpg --sign-key "$fpr"; then
- torify gpg --update-trustdb
+ if torsocks gpg --sign-key "$fpr"; then
+ torsocks gpg --update-trustdb
keys_signed=1
fi
fi
--
GitLab