Skip to content

Commit

Permalink
Guards Update: cannedKeyAlgoNames
Browse files Browse the repository at this point in the history
1. Update the guards around the strings used to make the
   cannedKeyAlgoNames. If any algorithm is disabled, leave it out of the
   list. (I'm looking at you Ed25519!)
2. Added comments to those guards.
3. Reflow the alignment.
  • Loading branch information
ejohnstown committed May 16, 2024
1 parent e12e725 commit a7bc5f9
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions src/internal.c
Original file line number Diff line number Diff line change
Expand Up @@ -738,17 +738,25 @@ static const char cannedKexAlgoNames[] =
#endif

static const char cannedKeyAlgoNames[] =
#ifndef WOLFSSH_NO_ED25519
"ssh-ed25519,"
#endif /* WOLFSSH_NO_ED25519 */
#ifndef WOLFSSH_NO_RSA_SHA2_256
"rsa-sha2-256,"
#endif/* WOLFSSH_NO_RSA_SHA2_256 */
#ifndef WOLFSSH_NO_ECDSA_SHA2_NISTP256
"ecdsa-sha2-nistp256,"
#endif /* WOLFSSH_NO_ECDSA_SHA2_NISTP256 */
#ifdef WOLFSSH_CERTS
"x509v3-ecdsa-sha2-nistp256,"
#ifndef WOLFSSH_NO_ECDSA_SHA2_NISTP256
"x509v3-ecdsa-sha2-nistp256,"
#endif /* WOLFSSH_NO_ECDSA_SHA2_NISTP256 */
#ifdef WOLFSSH_NO_SHA1_SOFT_DISABLE
"x509v3-ssh-rsa,"
#endif /* WOLFSSH_NO_SHA1_SOFT_DISABLE */
#endif /* WOLFSSH_CERTS */
#ifdef WOLFSSH_NO_SHA1_SOFT_DISABLE
"ssh-rsa,"
"ssh-rsa,"
#endif /* WOLFSSH_NO_SHA1_SOFT_DISABLE */
"";

Expand Down

0 comments on commit a7bc5f9

Please sign in to comment.