libssh2: do not use deprecated macros when unavailable#21867
Closed
vszakats wants to merge 2 commits into
Closed
Conversation
To support building with `LIBSSH2_NO_DEPRECATED` macro defined, a future libssh2 that may have dropped these macros. Ref: libssh2/libssh2#1977
There was a problem hiding this comment.
Pull request overview
This PR updates curl’s libssh2 SSH backend to build cleanly when libssh2 is configured to omit deprecated DSS-related macros (e.g., with LIBSSH2_NO_DEPRECATED), improving forward compatibility with potential future libssh2 releases.
Changes:
- Wraps
LIBSSH2_HOSTKEY_TYPE_DSSswitch cases with preprocessor guards to avoid referencing deprecated/removed macros. - Wraps
LIBSSH2_KNOWNHOST_KEY_SSHDSShandling with a preprocessor guard in knownhosts key-type selection.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+342
to
+346
| #ifdef LIBSSH2_HOSTKEY_TYPE_DSS | ||
| case LIBSSH2_HOSTKEY_TYPE_DSS: /* deprecated upstream */ | ||
| keybit = LIBSSH2_KNOWNHOST_KEY_SSHDSS; | ||
| break; | ||
| #endif |
Member
Author
There was a problem hiding this comment.
In theory, but in practice these two will almost certainly
have the same lifetime and enabled/disabled in pairs.
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.
To support building with
LIBSSH2_NO_DEPRECATEDmacro defined, a futurelibssh2 that may have dropped these macros.
Ref: libssh2/libssh2#1977