November 2017 - tor-commits - lists.torproject.org

[tor/release-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit 2777b469fa9e62763cdaee94c10446cf49d7d378 Merge: ef9251157 ece63105d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 11:13:22 2017 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit 441bfcd8856ee98f4d622e4ebbfcabe24624ca66 Merge: 512dfa15e 2777b469f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 11:13:22 2017 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit ad90a136b2dc25e73d1c668c9284e7ddf748dfe9 Merge: 55aafbf7b 441bfcd88 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 11:13:22 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2

1 0

[tor/release-0.3.2] Merge branch 'ticket21953_029' into maint-0.2.9
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit c928fb988a6679cc5aca380bcc568b165e5f7c4a Merge: 9666c620d 15cc41e66 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 11:13:18 2017 -0500 Merge branch 'ticket21953_029' into maint-0.2.9 changes/ticket21953 | 6 ++++++ src/or/main.c | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.9] Enable some windows hardening features
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit 503f101d2b1d8dfdd17cc2aa79fc10d79eecd04c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 11 16:39:02 2017 -0400 Enable some windows hardening features One (HeapEnableTerminationOnCorruption) is on-by-default since win8; the other (PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION) supposedly only affects ATL, which (we think) we don't use. Still, these are good hygiene. Closes ticket 21953. --- changes/ticket21953 | 6 ++++++ src/or/main.c | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/changes/ticket21953 b/changes/ticket21953 new file mode 100644 index 000000000..7cc84f506 --- /dev/null +++ b/changes/ticket21953 @@ -0,0 +1,6 @@ + o Minor features: + - Enable a couple of pieces of Windows hardening: one + (HeapEnableTerminationOnCorruption) that has been on-by-default since + Windows 8, and unavailable before Windows 7, and one + (PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION) which we believe doesn't + affect us, but shouldn't do any harm. Closes ticket 21953. diff --git a/src/or/main.c b/src/or/main.c index 66a857190..2de8ed29a 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3426,6 +3426,8 @@ tor_main(int argc, char *argv[]) int result = 0; #ifdef _WIN32 + /* On heap corruption, just give up; don't try to play along. */ + HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0); /* Call SetProcessDEPPolicy to permanently enable DEP. The function will not resolve on earlier versions of Windows, and failure is not dangerous. */ @@ -3434,7 +3436,10 @@ tor_main(int argc, char *argv[]) typedef BOOL (WINAPI *PSETDEP)(DWORD); PSETDEP setdeppolicy = (PSETDEP)GetProcAddress(hMod, "SetProcessDEPPolicy"); - if (setdeppolicy) setdeppolicy(1); /* PROCESS_DEP_ENABLE */ + if (setdeppolicy) { + /* PROCESS_DEP_ENABLE | PROCESS_DEP_DISABLE_ATL_THUNK_EMULATION */ + setdeppolicy(3); + } } #endif

1 0

[tor/maint-0.2.9] Define HeapEnableTerminationOnCorruption if the headers don't.
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit 15cc41e6649009ccd92d927850f918b962ee35d6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 19 06:44:13 2017 -0400 Define HeapEnableTerminationOnCorruption if the headers don't. MSDN says that it's always going to be 1, and they're usually pretty accurate about that. Fixes a bug in 21953. --- src/or/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index 2de8ed29a..187b255bf 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3426,6 +3426,9 @@ tor_main(int argc, char *argv[]) int result = 0; #ifdef _WIN32 +#ifndef HeapEnableTerminationOnCorruption +#define HeapEnableTerminationOnCorruption 1 +#endif /* On heap corruption, just give up; don't try to play along. */ HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0); /* Call SetProcessDEPPolicy to permanently enable DEP.

1 0

[tor/maint-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit ece63105d9157fa432cc59d8b828ca23a80040ff Merge: 5348c8996 c928fb988 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 11:13:22 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket21953 | 6 ++++++ src/or/main.c | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit ece63105d9157fa432cc59d8b828ca23a80040ff Merge: 5348c8996 c928fb988 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 11:13:22 2017 -0500 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/ticket21953 | 6 ++++++ src/or/main.c | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.0] Define HeapEnableTerminationOnCorruption if the headers don't.
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit 15cc41e6649009ccd92d927850f918b962ee35d6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 19 06:44:13 2017 -0400 Define HeapEnableTerminationOnCorruption if the headers don't. MSDN says that it's always going to be 1, and they're usually pretty accurate about that. Fixes a bug in 21953. --- src/or/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index 2de8ed29a..187b255bf 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -3426,6 +3426,9 @@ tor_main(int argc, char *argv[]) int result = 0; #ifdef _WIN32 +#ifndef HeapEnableTerminationOnCorruption +#define HeapEnableTerminationOnCorruption 1 +#endif /* On heap corruption, just give up; don't try to play along. */ HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0); /* Call SetProcessDEPPolicy to permanently enable DEP.

1 0

[tor/maint-0.2.9] Merge branch 'ticket21953_029' into maint-0.2.9
by nickm＠torproject.org 13 Nov '17

13 Nov '17

commit c928fb988a6679cc5aca380bcc568b165e5f7c4a Merge: 9666c620d 15cc41e66 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 13 11:13:18 2017 -0500 Merge branch 'ticket21953_029' into maint-0.2.9 changes/ticket21953 | 6 ++++++ src/or/main.c | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-)

1 0