[tor-commits] [tor/maint-0.2.7] Add some more ed25519 key files to the seccomp sandbox list

[nickm at torproject.org]

commit 2cbaf39af4aa5d2fd1a8ec143d254c9ba88fc0aa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 17 14:56:24 2015 -0500

    Add some more ed25519 key files to the seccomp sandbox list
    
    Fixes bug 17675; bugfix on 0.2.7.3-alpha.
---
 changes/bug17675 |    4 ++++
 src/or/main.c    |    3 +++
 2 files changed, 7 insertions(+)

diff --git a/changes/bug17675 b/changes/bug17675
new file mode 100644
index 0000000..8326a0b
--- /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 9b3dbb5..46c679c 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");