Skip to content

Commit 5ef2bc5

Browse files
Merge pull request #693 from ejohnstown/guards-update
Guards Update: cannedKeyAlgoNames
2 parents e12e725 + a7bc5f9 commit 5ef2bc5

1 file changed

Lines changed: 10 additions & 2 deletions

File tree

src/internal.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -738,17 +738,25 @@ static const char cannedKexAlgoNames[] =
738738
#endif
739739

740740
static const char cannedKeyAlgoNames[] =
741+
#ifndef WOLFSSH_NO_ED25519
741742
"ssh-ed25519,"
743+
#endif /* WOLFSSH_NO_ED25519 */
744+
#ifndef WOLFSSH_NO_RSA_SHA2_256
742745
"rsa-sha2-256,"
746+
#endif/* WOLFSSH_NO_RSA_SHA2_256 */
747+
#ifndef WOLFSSH_NO_ECDSA_SHA2_NISTP256
743748
"ecdsa-sha2-nistp256,"
749+
#endif /* WOLFSSH_NO_ECDSA_SHA2_NISTP256 */
744750
#ifdef WOLFSSH_CERTS
745-
"x509v3-ecdsa-sha2-nistp256,"
751+
#ifndef WOLFSSH_NO_ECDSA_SHA2_NISTP256
752+
"x509v3-ecdsa-sha2-nistp256,"
753+
#endif /* WOLFSSH_NO_ECDSA_SHA2_NISTP256 */
746754
#ifdef WOLFSSH_NO_SHA1_SOFT_DISABLE
747755
"x509v3-ssh-rsa,"
748756
#endif /* WOLFSSH_NO_SHA1_SOFT_DISABLE */
749757
#endif /* WOLFSSH_CERTS */
750758
#ifdef WOLFSSH_NO_SHA1_SOFT_DISABLE
751-
"ssh-rsa,"
759+
"ssh-rsa,"
752760
#endif /* WOLFSSH_NO_SHA1_SOFT_DISABLE */
753761
"";
754762

0 commit comments

Comments
 (0)