Guards Update: cannedKeyAlgoNames

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.
pull/693/head
John Safranek 2024-05-16 11:35:30 -07:00
parent e12e725678
commit a7bc5f95e9
1 changed files with 10 additions and 2 deletions

View File

@ -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 */
"";