Opened 5 weeks ago

Closed 5 weeks ago

#27687 closed defect (fixed)

rust protover accepts non ASCII in protocol names

Reported by: cyberpunks Owned by:
Priority: Medium Milestone: Tor: 0.3.5.x-final
Component: Core Tor/Tor Version: Tor: 0.3.3.1-alpha
Severity: Normal Keywords: rust, protover, 033-backport, 034-backport
Cc: Actual Points:
Parent ID: #27316 Points:
Reviewer: teor Sponsor:

Description


Child Tickets

Change History (5)

comment:1 Changed 5 weeks ago by cyberpunks

See branch rust-protokeyword1 at ​https://gitgud.io/onionk/tor.git

comment:2 Changed 5 weeks ago by teor

Milestone: Tor: 0.3.5.x-final
Reviewer: teor
Status: newneeds_revision

This branch doesn't merge cleanly into master, I think because some other fixes have already been merged to master, or because of code formatting. Can you rebase this branch on the latest maint-0.3.3?

If this branch is already on the latest 0.3.3, can you try merging to 0.3.4 and master, and provide branches for the non-trivial merges?

I opened a pull request for this branch on 0.3.3 here:
https://github.com/torproject/tor/pull/333

Once the merge conflicts are fixed, we can merge to 0.3.4 to get Appveyor CI as well.

comment:3 in reply to:  2 ; Changed 5 weeks ago by cyberpunks

Replying to teor:

If this branch is already on the latest 0.3.3, can you try merging to 0.3.4 and master, and provide branches for the non-trivial merges?

Done. The conflicts in master were due to the rustfmt changes.

comment:4 in reply to:  3 Changed 5 weeks ago by teor

Status: needs_revisionmerge_ready

Replying to cyberpunks:

Replying to teor:

If this branch is already on the latest 0.3.3, can you try merging to 0.3.4 and master, and provide branches for the non-trivial merges?

Done. The conflicts in master were due to the rustfmt changes.

Thanks!

I just realised that Appveyor doesn't run rust, so I think we're fine to merge rust-protokeyword1 into 0.3.3 and forward, and rust-protokeyword1-035 into master. (rust-protokeyword1-034 seems like a trivial merge?)

comment:5 Changed 5 weeks ago by nickm

Resolution: fixed
Status: merge_readyclosed

Merged to 0.3.3 and forward. Thanks!

Note: See TracTickets for help on using tickets.