#13 - Update SSH_SK_VERSION_MAJOR from 7 to 9#16
Open
madaster97 wants to merge 3 commits intotavrez:masterfrom
Open
#13 - Update SSH_SK_VERSION_MAJOR from 7 to 9#16madaster97 wants to merge 3 commits intotavrez:masterfrom
madaster97 wants to merge 3 commits intotavrez:masterfrom
Conversation
Owner
|
Many thanks! I’ll release a preview version based on this!
…On Tue, Aug 9, 2022 at 7:23 AM Adam Strickland ***@***.***> wrote:
Addressing issue 13
<#13>, I copied this
version of sk-api.h and changed a couple variables to match the names
within (from message to data).
After that, I was able to create a key against Openssh_9.0p1, OpenSSL
1.1.1q Jul 5 2022 using my yubikey + windows hello.
------------------------------
You can view, comment on, or merge this pull request online at:
#16
Commit Summary
- 13036d5
<13036d5>
Just change 7 to 9
- 123ac4c
<123ac4c>
Apply newest webauthn header file
- 747b831
<747b831>
Change "message" to "data" from new sk-api.h
File Changes
(3 files <https://github.com/tavrez/openssh-sk-winhello/pull/16/files>)
- *M* src/sk-api.h
<https://github.com/tavrez/openssh-sk-winhello/pull/16/files#diff-4f5fffd10fe14dabda631f12bb97a8989ede7e15a9b7bc39b0e41961fc5f415f>
(11)
- *M* src/webauthn/webauthn.h
<https://github.com/tavrez/openssh-sk-winhello/pull/16/files#diff-727d3755c4cb0fee43813f243f100af8b7ce9db552e1a0280397d6451a8e91aa>
(308)
- *M* src/winhello.c
<https://github.com/tavrez/openssh-sk-winhello/pull/16/files#diff-3cc466f067d3c26e566f128619db4d1db31457db889572cf3b151cb310d65870>
(4)
Patch Links:
- https://github.com/tavrez/openssh-sk-winhello/pull/16.patch
- https://github.com/tavrez/openssh-sk-winhello/pull/16.diff
—
Reply to this email directly, view it on GitHub
<#16>, or unsubscribe
<https://github.com/notifications/unsubscribe-auth/ACFM2DLRLV5GVDHJFTCBX73VYHB4BANCNFSM557E662A>
.
You are receiving this because you are subscribed to this thread.Message
ID: ***@***.***>
|
|
This is also working for me. I tested with OpenSSH_9.0p1 in cygwin (64-bit). |
|
With OpenSSH_9.1p1, this is broken again: but it can be fixed with: diff --git a/src/sk-api.h b/src/sk-api.h
index 2445438..ca2015e 100644
--- a/src/sk-api.h
+++ b/src/sk-api.h
@@ -77,7 +77,7 @@ struct sk_option {
uint8_t required;
};
-#define SSH_SK_VERSION_MAJOR 0x00090000 /* current API version */
+#define SSH_SK_VERSION_MAJOR 0x000a0000 /* current API version */
#define SSH_SK_VERSION_MAJOR_MASK 0xffff0000
/* Return the version of the middleware API */ |
Author
|
@tavrez , how do you think we should handle these frequent version bumps in OpenSSH-portable? Should we tag a release for major version 9, and then make a new one for major version a? @ivan , it looks like this commit did more than just update the version number, and may have introduced other changes we need to make. Did you take a look at/test that? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Addressing issue 13, I copied this version of
sk-api.hand changed a couple variables to match the names within (from message to data).After that, I was able to create a key against
Openssh_9.0p1, OpenSSL 1.1.1q Jul 5 2022using my yubikey + windows hello.By bumping from 7 to 9, we'll notably be missing support for 8 and a. See mentions of
SSH_SK_VERSION_MAJORin the OpenSSH release notes, and these commits that edit thesk-api.hfile.