Prechádzať zdrojové kódy

Merge branch 'maint-0.2.7'

Nick Mathewson 9 rokov pred
rodič
commit
8585cc57f8
2 zmenil súbory, kde vykonal 7 pridanie a 0 odobranie
  1. 4 0
      changes/bug17675
  2. 3 0
      src/or/main.c

+ 4 - 0
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.

+ 3 - 0
src/or/main.c

@@ -3462,6 +3462,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");