Merge pull request wolfSSL#693 from ejohnstown/guards-update

Guards Update: cannedKeyAlgoNames
ejohnstown · May 16, 2024 · 5ef2bc5 · 5ef2bc5
2 parents e12e725 + a7bc5f9
commit 5ef2bc5
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/src/internal.c b/src/internal.c
@@ -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 */
     "";