Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade openssh to v9.1 #60

Merged
merged 5 commits into from
Nov 3, 2022
Merged

Conversation

dscho
Copy link
Member

@dscho dscho commented Oct 6, 2022

This is a work-in-progress, mainly because I want to upgrade libfido2, too, in order to get ssh-keygen -t ecdsa-sk to use Windows Hello, but in my current attempts to build it, things break like this:

$ ssh-keygen.exe -v -v -v -v -v -v -t ecdsa-sk
Generating public/private ecdsa-sk key pair.
You may need to touch your authenticator to authorize key generation.
debug3: start_helper: started pid=53312
debug3: ssh_msg_send: type 5
debug3: ssh_msg_recv entering
debug1: start_helper: starting /usr/lib/ssh/ssh-sk-helper
ssh_msg_recv: read header: Software caused connection abort
client_converse: receive: unexpected internal error
debug3: reap_helper: pid=53312
reap_helper: helper exited with non-zero exit status
Key enrollment failed: unexpected internal error

This addresses git-for-windows/git#4051

@dscho
Copy link
Member Author

dscho commented Oct 17, 2022

I've decided to let the libfido2 upgrade slide for a while, as I suspect it to be quite a bit involved due to the segmentation fault (the first time I tried to get libfido2 to build and work properly, it took a couple of days to get it right, that's an amount of time I cannot spare right now).

@dscho dscho marked this pull request as ready for review October 17, 2022 07:15
@rimrul rimrul self-requested a review October 17, 2022 07:24
@dscho dscho changed the title [DO NOT MERGE YET] Upgrade openssh to v9.1 Upgrade openssh to v9.1 Oct 17, 2022
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
No need to deviate from upstream.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
In GitHub workflows, it looks as if Strawberry Perl's `gmake.exe` is
preferred...

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
No need to deviate from upstream.

Incidentally, this also adds support for security keys backed by Windows
Hello.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The first patch did not apply.

While at it, prepare for a potential future change where the MSYS2
runtime starts respecting the `CYGWIN` variable if the `MSYS` variable
is unset (msys2/msys2-runtime#70), by not only
forcing `MSYS` to be empty in the `bsd-cygwin_util, but also `CYGWIN`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
@dscho dscho force-pushed the upgrade-openssh-to-v9.1 branch 2 times, most recently from 2232262 to 53c3770 Compare November 3, 2022 09:20
@dscho dscho merged commit 92028f2 into git-for-windows:main Nov 3, 2022
@dscho dscho deleted the upgrade-openssh-to-v9.1 branch November 3, 2022 10:04
@dscho
Copy link
Member Author

dscho commented Nov 3, 2022

Now off to the races: build libcbor first.

@dscho
Copy link
Member Author

dscho commented Nov 3, 2022

And now libfido2.

@dscho
Copy link
Member Author

dscho commented Nov 3, 2022

And now libfido2.

Which failed because of a missing public key. I edited the Azure Pipeline definition and started another build.

@dscho
Copy link
Member Author

dscho commented Nov 3, 2022

And now, finally, let's build openssh.

@dscho
Copy link
Member Author

dscho commented Nov 3, 2022

It finally built all right!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants