warning #MISC_WARNING fix & unused previx gates

gojimmypi · Dec 26, 2023 · 7137a25 · 7137a25
1 parent 1f4ee45
commit 7137a25
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/misc.c b/src/misc.c
@@ -56,7 +56,7 @@
     #define MISC_WARNING "misc.c does not need to be compiled when using inline (NO_INLINE not defined))"
 
     #ifndef _MSC_VER
-        #warning MISC_WARNING
+        #warning #MISC_WARNING
     #else
         #pragma message("warning: " MISC_WARNING)
     #endif

diff --git a/src/ssh.c b/src/ssh.c
@@ -1488,10 +1488,13 @@ union wolfSSH_key {
 
 static const char* PrivBeginOpenSSH = "-----BEGIN OPENSSH PRIVATE KEY-----";
 static const char* PrivEndOpenSSH = "-----END OPENSSH PRIVATE KEY-----";
-static const char* PrivBeginPrefix = "-----BEGIN ";
-/* static const char* PrivEndPrefix = "-----END "; */
-static const char* PrivSuffix = " PRIVATE KEY-----";
 
+#if !defined(NO_FILESYSTEM) && !defined(WOLFSSH_USER_FILESYSTEM)
+    /* currently only used in wolfSSH_ReadKey_file() */
+    static const char* PrivBeginPrefix = "-----BEGIN ";
+    /* static const char* PrivEndPrefix = "-----END "; */
+    static const char* PrivSuffix = " PRIVATE KEY-----";
+#endif
 
 static int DoSshPubKey(const byte* in, word32 inSz, byte** out,
         word32* outSz, const byte** outType, word32* outTypeSz,
@@ -1503,7 +1506,7 @@ static int DoSshPubKey(const byte* in, word32 inSz, byte** out,
     char* type = NULL;
     char* key = NULL;
     int ret = WS_SUCCESS;
-    word32 newKeySz, typeSz;
+    word32 newKeySz, typeSz = 0;
 
     WOLFSSH_UNUSED(inSz);
     WOLFSSH_UNUSED(heap);