Merge lp://staging/~nmb/bzr/561061-openssh-protocol into lp://staging/bzr
Proposed by
Neil Martinsen-Burrell
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Vincent Ladeuil | ||||
| Approved revision: | no longer in the source branch. | ||||
| Merged at revision: | 5468 | ||||
| Proposed branch: | lp://staging/~nmb/bzr/561061-openssh-protocol | ||||
| Merge into: | lp://staging/bzr | ||||
| Diff against target: |
48 lines (+6/-3) 3 files modified
NEWS (+3/-0) bzrlib/tests/test_ssh_transport.py (+2/-2) bzrlib/transport/ssh.py (+1/-1) |
||||
| To merge this branch: | bzr merge lp://staging/~nmb/bzr/561061-openssh-protocol | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Pool | Approve | ||
| John A Meinel | Approve | ||
|
Review via email:
|
|||
Commit message
Don't force openssh to use protocol=2
Description of the change
This is an easy change to stop forcing protocol=2 since it (apparently) causes problems for people who have their private keys named differently. JamesH hasn't responded about why the protocol version is forced and since many servers don't even offer protocol=1 these days (Protocol=2 only is the default in Ubuntu 10.04 LTS at least) this seems like a safe change.
To post a comment you must log in.
Revision history for this message
| Vincent Ladeuil (vila) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
I'm going to try to get ahold of jamesh, though he lives in Perth, so the timezone overlap is a bit poor.
My guess is "-oProtocol=1" is weak cryptography with some known holes, so why should we try to support it.
Now, I don't think we want to force Protocol=2 if there was a potential Protocol=3 that would be better.
Though if someone has to access an old server, and has to use protocol=1, I don't see why it would be *our* job to prevent them.
So overall, I think I approve this change.