Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
The Tor Project
Core
Tor
Commits
90017323
Commit
90017323
authored
4 years ago
by
Nick Mathewson
Browse files
Options
Downloads
Plain Diff
Merge branch 'maint-0.4.3' into maint-0.4.4
parents
3f1544bb
7c0778ef
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
changes/bug40179_part1
+4
-0
4 additions, 0 deletions
changes/bug40179_part1
src/test/hs_ntor_ref.py
+4
-2
4 additions, 2 deletions
src/test/hs_ntor_ref.py
with
8 additions
and
2 deletions
changes/bug40179_part1
0 → 100644
+
4
−
0
View file @
90017323
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.
This diff is collapsed.
Click to expand it.
src/test/hs_ntor_ref.py
+
4
−
2
View file @
90017323
...
...
@@ -70,14 +70,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
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment