Merge pull request #808 from gojimmypi/pr-DoAsn1Key-RSA-check

ejohnstown · web-flow · commit 35a24e33d47e · 2025-06-11T14:37:19.000-07:00
DoAsn1Key now fails when WOLFSSH_NO_RSA is defined
diff --git a/src/ssh.c b/src/ssh.c
@@ -1737,6 +1737,7 @@ static int DoAsn1Key(const byte* in, word32 inSz, byte** out,
     }
 
     if (ret > 0 && !isPrivate) {
+#ifndef WOLFSSH_NO_RSA
         long e;
         byte n[RSA_MAX_SIZE]; /* TODO: Handle small stack */
         word32 nSz = (word32)sizeof(n), eSz = (word32)sizeof(e);
@@ -1785,6 +1786,10 @@ static int DoAsn1Key(const byte* in, word32 inSz, byte** out,
 
             *out = newKey;
         }
+#else
+        WLOG(WS_LOG_DEBUG, "DoAsn1Key failed; WOLFSSH_NO_RSA disabled RSA");
+        ret = WS_UNIMPLEMENTED_E;
+#endif
     }
     else if (ret > 0 && isPrivate) {
         if (*out == NULL) {

Original file line number	Diff line number	Diff line change
`@@ -1737,6 +1737,7 @@ static int DoAsn1Key(const byte* in, word32 inSz, byte** out,`
`1737`	`1737`	`}`
`1738`	`1738`
`1739`	`1739`	`if (ret > 0 && !isPrivate) {`
	`1740`	`+#ifndef WOLFSSH_NO_RSA`
`1740`	`1741`	`long e;`
`1741`	`1742`	`byte n[RSA_MAX_SIZE]; /* TODO: Handle small stack */`
`1742`	`1743`	`word32 nSz = (word32)sizeof(n), eSz = (word32)sizeof(e);`
`@@ -1785,6 +1786,10 @@ static int DoAsn1Key(const byte* in, word32 inSz, byte** out,`
`1785`	`1786`
`1786`	`1787`	`*out = newKey;`
`1787`	`1788`	`}`
	`1789`	`+#else`
	`1790`	`+ WLOG(WS_LOG_DEBUG, "DoAsn1Key failed; WOLFSSH_NO_RSA disabled RSA");`
	`1791`	`+ ret = WS_UNIMPLEMENTED_E;`
	`1792`	`+#endif`
`1788`	`1793`	`}`
`1789`	`1794`	`else if (ret > 0 && isPrivate) {`
`1790`	`1795`	`if (*out == NULL) {`