Skip to content

Add openssh 9.6 patch#161

Merged
douzzer merged 1 commit intowolfSSL:masterfrom
julek-wolfssl:openssh-9.6
Feb 8, 2024
Merged

Add openssh 9.6 patch#161
douzzer merged 1 commit intowolfSSL:masterfrom
julek-wolfssl:openssh-9.6

Conversation

@julek-wolfssl
Copy link
Copy Markdown
Member

No description provided.

Copy link
Copy Markdown
Contributor

@douzzer douzzer left a comment

Choose a reason for hiding this comment

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

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.

@douzzer douzzer assigned julek-wolfssl and unassigned wolfSSL-Bot Jan 31, 2024
@julek-wolfssl
Copy link
Copy Markdown
Member Author

@douzzer what configurations did you use?

@douzzer douzzer merged commit 40efe9f into wolfSSL:master Feb 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants