Skip to content

Fix webauthnwin c types size #31407

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.

Sign up for GitHub

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

Merged
tobiaszheller merged 1 commit into from
Sep 5, 2023
Merged

Fix webauthnwin c types size #31407

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions lib/auth/webauthnwin/ctypes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ type webauthnRPEntityInformation struct {
// "Acme Corporation", "Widgets Inc" or "Awesome Site".
// This field is required.
pwszName *uint16

// RP icon (previously pwszIcon).
// This field is kept just to keep size of struct valid.
_ *uint16
Copy link
Copy Markdown
Collaborator

@zmb3 zmb3 Sep 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, if the size of the struct matters, shouldn't we be more explicit? A *uint16 can have different sizes on different platforms, no?

Copy link
Copy Markdown
Contributor Author

@tobiaszheller tobiaszheller Sep 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i believe we don't support 32bit tsh at all for windows

}

type webauthnUserEntityInformation struct {
Expand All @@ -46,6 +50,9 @@ type webauthnUserEntityInformation struct {
// "john.p.smith@example.com".
// It holds the Teleport user name.
pwszName *uint16
// User icon (previously pwszIcon).
// This field is kept just to keep size of struct valid.
_ *uint16
// For User: Contains the friendly name associated with the user account by the Relying Party, such as "John P. Smith".
pwszDisplayName *uint16
}
Expand Down