Add openssh 9.6 patch#161
Merged
douzzer merged 1 commit intowolfSSL:masterfrom Feb 8, 2024
Merged
Conversation
douzzer
requested changes
Jan 31, 2024
Contributor
douzzer
left a comment
There was a problem hiding this comment.
symbol collision needs fix:
ed25519.c:142:22: error: ‘ge’ redeclared as different kind of symbol
142 | static crypto_uint32 ge(crypto_uint32 a,crypto_uint32 b) /* 16-bit inputs */
| ^~
In file included from /home/douzzer/com/wolfssl/src/wolfssl/installed_75bd1af110/include/wolfssl/wolfcrypt/ed25519.h:35,
from /home/douzzer/com/wolfssl/src/wolfssl/installed_75bd1af110/include/wolfssl/wolfcrypt/cryptocb.h:66,
from /home/douzzer/com/wolfssl/src/wolfssl/installed_75bd1af110/include/wolfssl/ssl.h:49,
from /home/douzzer/com/wolfssl/src/wolfssl/installed_75bd1af110/include/wolfssl/openssl/ssl.h:37,
from includes.h:168,
from ed25519.c:12:
/home/douzzer/com/wolfssl/src/wolfssl/installed_75bd1af110/include/wolfssl/wolfcrypt/ge_operations.h:51:28:note: previous declaration of ‘ge’ with type ‘ge’ {aka ‘long long int[4]’}
51 | ALIGN16 typedef sword64 ge[4];
| ^~
renaming their ge() to my_ge() fixed the build and the resulting ssh client executable worked right for me on cursory testing that included an ED25519 host key.
Member
Author
|
@douzzer what configurations did you use? |
This was referenced Feb 2, 2024
douzzer
approved these changes
Feb 8, 2024
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.
No description provided.