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

[tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.3
by nickm＠torproject.org 17 Nov '20

17 Nov '20

commit 7c0778ef7e05e859c62346a795952f127972b35e Merge: fd22fa183b fcae26adf7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 16 22:42:22 2020 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/bug40179_part1 | 4 ++++ src/test/hs_ntor_ref.py | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.4] Handle a change in the implementation of hashlib in Python 3.9
by nickm＠torproject.org 17 Nov '20

17 Nov '20

commit 31a6a101a0c4cbe739a55069bf29a0f0615e5aa8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 5 09:34:36 2020 -0500 Handle a change in the implementation of hashlib in Python 3.9 Previously, hashlib.shake_256 was a class (if present); now it can also be a function. This change invalidated our old compatibility/workaround code, and made one of our tests fail. Fixes bug 40179; bugfix on 0.3.1.6-rc when the workaround code was added. --- changes/bug40179_part1 | 4 ++++ src/test/hs_ntor_ref.py | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug40179_part1 b/changes/bug40179_part1 new file mode 100644 index 0000000000..c302373534 --- /dev/null +++ b/changes/bug40179_part1 @@ -0,0 +1,4 @@ + o Minor bugfixes (testing, portability): + - Fix our Python reference-implementation for the v3 onion service + handshake so that it works correctly with the version of hashlib provided + by Python 3.9. Fixes part of bug 40179; bugfix on 0.3.1.6-rc. diff --git a/src/test/hs_ntor_ref.py b/src/test/hs_ntor_ref.py index 1b9772a5d6..d58ac3ca23 100644 --- a/src/test/hs_ntor_ref.py +++ b/src/test/hs_ntor_ref.py @@ -65,14 +65,16 @@ except ImportError: try: # Pull the sha3 functions in. from hashlib import sha3_256, shake_256 - shake_squeeze = shake_256.digest + def shake_squeeze(obj, n): + return obj.digest(n) except ImportError: if hasattr(sha3, "SHA3256"): # If this happens, then we have the old "sha3" module which # hashlib and pysha3 superseded. sha3_256 = sha3.SHA3256 shake_256 = sha3.SHAKE256 - shake_squeeze = shake_256.squeeze + def shake_squeeze(obj, n): + return obj.squeeze(n) else: # error code 77 tells automake to skip this test sys.exit(77)

1 0

[tor/maint-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
by nickm＠torproject.org 17 Nov '20

17 Nov '20

commit 90017323942dc56b23d98c34894542e30856aeac Merge: 3f1544bbd9 7c0778ef7e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 16 22:42:22 2020 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/bug40179_part1 | 4 ++++ src/test/hs_ntor_ref.py | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0

[tor/master] Handle a change in the implementation of hashlib in Python 3.9
by nickm＠torproject.org 17 Nov '20

17 Nov '20

commit 31a6a101a0c4cbe739a55069bf29a0f0615e5aa8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 5 09:34:36 2020 -0500 Handle a change in the implementation of hashlib in Python 3.9 Previously, hashlib.shake_256 was a class (if present); now it can also be a function. This change invalidated our old compatibility/workaround code, and made one of our tests fail. Fixes bug 40179; bugfix on 0.3.1.6-rc when the workaround code was added. --- changes/bug40179_part1 | 4 ++++ src/test/hs_ntor_ref.py | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug40179_part1 b/changes/bug40179_part1 new file mode 100644 index 0000000000..c302373534 --- /dev/null +++ b/changes/bug40179_part1 @@ -0,0 +1,4 @@ + o Minor bugfixes (testing, portability): + - Fix our Python reference-implementation for the v3 onion service + handshake so that it works correctly with the version of hashlib provided + by Python 3.9. Fixes part of bug 40179; bugfix on 0.3.1.6-rc. diff --git a/src/test/hs_ntor_ref.py b/src/test/hs_ntor_ref.py index 1b9772a5d6..d58ac3ca23 100644 --- a/src/test/hs_ntor_ref.py +++ b/src/test/hs_ntor_ref.py @@ -65,14 +65,16 @@ except ImportError: try: # Pull the sha3 functions in. from hashlib import sha3_256, shake_256 - shake_squeeze = shake_256.digest + def shake_squeeze(obj, n): + return obj.digest(n) except ImportError: if hasattr(sha3, "SHA3256"): # If this happens, then we have the old "sha3" module which # hashlib and pysha3 superseded. sha3_256 = sha3.SHA3256 shake_256 = sha3.SHAKE256 - shake_squeeze = shake_256.squeeze + def shake_squeeze(obj, n): + return obj.squeeze(n) else: # error code 77 tells automake to skip this test sys.exit(77)

1 0

[tor/master] Merge branch 'maint-0.3.5' into maint-0.4.3
by nickm＠torproject.org 17 Nov '20

17 Nov '20

commit 7c0778ef7e05e859c62346a795952f127972b35e Merge: fd22fa183b fcae26adf7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 16 22:42:22 2020 -0500 Merge branch 'maint-0.3.5' into maint-0.4.3 changes/bug40179_part1 | 4 ++++ src/test/hs_ntor_ref.py | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/195' into maint-0.3.5
by nickm＠torproject.org 17 Nov '20

17 Nov '20

commit fcae26adf710cf1fe393fde723e9a2caf6012b09 Merge: 862c44e4ec 31a6a101a0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 16 22:42:15 2020 -0500 Merge remote-tracking branch 'tor-gitlab/mr/195' into maint-0.3.5 changes/bug40179_part1 | 4 ++++ src/test/hs_ntor_ref.py | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
by nickm＠torproject.org 17 Nov '20

17 Nov '20

commit 90017323942dc56b23d98c34894542e30856aeac Merge: 3f1544bbd9 7c0778ef7e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 16 22:42:22 2020 -0500 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/bug40179_part1 | 4 ++++ src/test/hs_ntor_ref.py | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.4' into master
by nickm＠torproject.org 17 Nov '20

17 Nov '20

commit c79957581e5d6c64fdae2be5b4d5a188ed18960a Merge: d425dbf04a 9001732394 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 16 22:42:23 2020 -0500 Merge branch 'maint-0.4.4' into master changes/bug40179_part1 | 4 ++++ src/test/hs_ntor_ref.py | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.5] Handle a change in the implementation of hashlib in Python 3.9
by nickm＠torproject.org 17 Nov '20

17 Nov '20

commit 31a6a101a0c4cbe739a55069bf29a0f0615e5aa8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 5 09:34:36 2020 -0500 Handle a change in the implementation of hashlib in Python 3.9 Previously, hashlib.shake_256 was a class (if present); now it can also be a function. This change invalidated our old compatibility/workaround code, and made one of our tests fail. Fixes bug 40179; bugfix on 0.3.1.6-rc when the workaround code was added. --- changes/bug40179_part1 | 4 ++++ src/test/hs_ntor_ref.py | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug40179_part1 b/changes/bug40179_part1 new file mode 100644 index 0000000000..c302373534 --- /dev/null +++ b/changes/bug40179_part1 @@ -0,0 +1,4 @@ + o Minor bugfixes (testing, portability): + - Fix our Python reference-implementation for the v3 onion service + handshake so that it works correctly with the version of hashlib provided + by Python 3.9. Fixes part of bug 40179; bugfix on 0.3.1.6-rc. diff --git a/src/test/hs_ntor_ref.py b/src/test/hs_ntor_ref.py index 1b9772a5d6..d58ac3ca23 100644 --- a/src/test/hs_ntor_ref.py +++ b/src/test/hs_ntor_ref.py @@ -65,14 +65,16 @@ except ImportError: try: # Pull the sha3 functions in. from hashlib import sha3_256, shake_256 - shake_squeeze = shake_256.digest + def shake_squeeze(obj, n): + return obj.digest(n) except ImportError: if hasattr(sha3, "SHA3256"): # If this happens, then we have the old "sha3" module which # hashlib and pysha3 superseded. sha3_256 = sha3.SHA3256 shake_256 = sha3.SHAKE256 - shake_squeeze = shake_256.squeeze + def shake_squeeze(obj, n): + return obj.squeeze(n) else: # error code 77 tells automake to skip this test sys.exit(77)

1 0

[tor/release-0.3.5] Merge remote-tracking branch 'tor-gitlab/mr/195' into maint-0.3.5
by nickm＠torproject.org 17 Nov '20

17 Nov '20

commit fcae26adf710cf1fe393fde723e9a2caf6012b09 Merge: 862c44e4ec 31a6a101a0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 16 22:42:15 2020 -0500 Merge remote-tracking branch 'tor-gitlab/mr/195' into maint-0.3.5 changes/bug40179_part1 | 4 ++++ src/test/hs_ntor_ref.py | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0