Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
Tor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
ZerXes
Tor
Commits
74cfe361
Commit
74cfe361
authored
3 years ago
by
George Kadianakis
Browse files
Options
Downloads
Plain Diff
Merge branch 'maint-0.4.5'
parents
ceefdf98
4cbd22f1
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/bug40238
+3
-0
3 additions, 0 deletions
changes/bug40238
src/feature/dirparse/routerparse.c
+11
-0
11 additions, 0 deletions
src/feature/dirparse/routerparse.c
with
14 additions
and
0 deletions
changes/bug40238
0 → 100644
+
3
−
0
View file @
74cfe361
o Minor bugfixes (logging):
- Reject obsolete router/extrainfo descs earlier and more quietly.
Fixes bug 40238; bugfix on 0.4.5.1-alpha.
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/feature/dirparse/routerparse.c
+
11
−
0
View file @
74cfe361
...
...
@@ -456,6 +456,12 @@ router_parse_entry_from_string(const char *s, const char *end,
}
}
if
(
!
tor_memstr
(
s
,
end
-
s
,
"
\n
proto "
))
{
log_debug
(
LD_DIR
,
"Found an obsolete router descriptor. "
"Rejecting quietly."
);
goto
err
;
}
if
(
router_get_router_hash
(
s
,
end
-
s
,
digest
)
<
0
)
{
log_warn
(
LD_DIR
,
"Couldn't compute router hash."
);
goto
err
;
...
...
@@ -991,6 +997,11 @@ extrainfo_parse_entry_from_string(const char *s, const char *end,
while
(
end
>
s
+
2
&&
*
(
end
-
1
)
==
'\n'
&&
*
(
end
-
2
)
==
'\n'
)
--
end
;
if
(
!
tor_memstr
(
s
,
end
-
s
,
"
\n
identity-ed25519"
))
{
log_debug
(
LD_DIR
,
"Found an obsolete extrainfo. Rejecting quietly."
);
goto
err
;
}
if
(
router_get_extrainfo_hash
(
s
,
end
-
s
,
digest
)
<
0
)
{
log_warn
(
LD_DIR
,
"Couldn't compute router hash."
);
goto
err
;
...
...
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