aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-12-17 14:56:24 -0500
committerNick Mathewson <nickm@torproject.org>2015-12-17 14:56:24 -0500
commit2cbaf39af4aa5d2fd1a8ec143d254c9ba88fc0aa (patch)
treefda27490cfc715ec291d1acade14f5fa82c830dc
parent33b5bfb94824a55254f1ffcddf38ac17589a2744 (diff)
downloadtor-2cbaf39af4aa5d2fd1a8ec143d254c9ba88fc0aa.tar.gz
tor-2cbaf39af4aa5d2fd1a8ec143d254c9ba88fc0aa.zip
Add some more ed25519 key files to the seccomp sandbox list
Fixes bug 17675; bugfix on 0.2.7.3-alpha.
-rw-r--r--changes/bug176754
-rw-r--r--src/or/main.c3
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug17675 b/changes/bug17675
new file mode 100644
index 0000000000..8326a0b9e8
--- /dev/null
+++ b/changes/bug17675
@@ -0,0 +1,4 @@
+ o Minor bugfixes (linux seccomp2 sandbox):
+ - Fix a crash when using offline master ed25519 keys with the
+ Linux seccomp2 sandbox enabled. Fixes bug 17675; bugfix on
+ 0.2.7.3-alpha.
diff --git a/src/or/main.c b/src/or/main.c
index 9b3dbb5586..46c679c83c 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -3171,6 +3171,9 @@ sandbox_init_filter(void)
".tmp");
OPEN_DATADIR2_SUFFIX("keys", "ed25519_master_id_public_key", ".tmp");
OPEN_DATADIR2_SUFFIX("keys", "ed25519_signing_secret_key", ".tmp");
+ OPEN_DATADIR2_SUFFIX("keys", "ed25519_signing_secret_key_encrypted",
+ ".tmp");
+ OPEN_DATADIR2_SUFFIX("keys", "ed25519_signing_public_key", ".tmp");
OPEN_DATADIR2_SUFFIX("keys", "ed25519_signing_cert", ".tmp");
OPEN_DATADIR2_SUFFIX("stats", "bridge-stats", ".tmp");