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.

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

Jump to bottom

GUACAMOLE-2012: Fix SSH connection to FIPS servers which only offer AES GCM #572

Merged
merged 1 commit into from
Jan 11, 2025
Merged

GUACAMOLE-2012: Fix SSH connection to FIPS servers which only offer AES GCM #572

merged 1 commit into from
Jan 11, 2025
+65 −1

Conversation

eugen-keeper
Copy link
Contributor

  • Added AES GCM ciphers to the FIPS compliant cipher list
  • Added some code to check if the hardcoded FIPS compliant ciphers are really supported by libssh2

@eugen-keeper eugen-keeper marked this pull request as draft January 7, 2025 17:20
@eugen-keeper eugen-keeper marked this pull request as ready for review January 7, 2025 18:55
necouchman
necouchman requested changes Jan 7, 2025
View reviewed changes
Copy link
Contributor

@necouchman necouchman left a comment

Choose a reason for hiding this comment

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

Looks pretty good to me - the only thing that I see is an opportunity for some comments in the new function you implemented - the existing code around that has bits of documentation throughout, so maybe just brush that up a bit in the new code?

mike-jumper
mike-jumper requested changes Jan 8, 2025
View reviewed changes
src/common-ssh/ssh.c Outdated Show resolved Hide resolved
src/common-ssh/ssh.c Outdated Show resolved Hide resolved
src/common-ssh/ssh.c Outdated Show resolved Hide resolved
src/common-ssh/ssh.c Outdated Show resolved Hide resolved
src/common-ssh/ssh.c Outdated Show resolved Hide resolved
src/common-ssh/ssh.c Outdated Show resolved Hide resolved
src/common-ssh/ssh.c Outdated Show resolved Hide resolved
src/common-ssh/ssh.c Outdated Show resolved Hide resolved
src/common-ssh/ssh.c Outdated Show resolved Hide resolved
src/common-ssh/ssh.c Outdated Show resolved Hide resolved
mike-jumper
mike-jumper requested changes Jan 9, 2025
View reviewed changes
src/common-ssh/ssh.c Outdated Show resolved Hide resolved
@mike-jumper
Copy link
Contributor

mike-jumper commented Jan 9, 2025 •
edited
Loading

@eugen-keeper Please also:

  1. Rebase to remove the merge commit.
  2. Either add context to the commit messages ("Fix a size calculation issue" is a bit vague, for example) or squash them into a single commit. An excellent blog post on this: https://www.codelord.net/2015/03/16/bad-commit-messages-hall-of-shame/

@eugen-keeper eugen-keeper reopened this Jan 9, 2025
@mike-jumper mike-jumper changed the base branch from main to patch January 10, 2025 01:20
mike-jumper
mike-jumper requested changes Jan 10, 2025
View reviewed changes
src/common-ssh/ssh.c Outdated Show resolved Hide resolved
src/common-ssh/ssh.c Show resolved Hide resolved
@mike-jumper
Copy link
Contributor

LGTM.

@necouchman Any further thoughts?

necouchman
necouchman approved these changes Jan 11, 2025
View reviewed changes
Copy link
Contributor

@necouchman necouchman left a comment

Choose a reason for hiding this comment

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

All good, here.

@mike-jumper mike-jumper merged commit 97558a8 into apache:patch Jan 11, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@necouchman necouchman necouchman approved these changes

@mike-jumper mike-jumper mike-jumper approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@eugen-keeper @mike-jumper @necouchman