wolfcrypt/src/rsa.c: in wc_RsaFunction_ex(), if defined(WOLF_CRYPTO_CB_ONLY_RSA), add clause to return NO_VALID_DEVID if key->devId == INVALID_DEVID. fixes "control reaches end of non-void function" in PRB-single-flag.txt.

douzzer · douzzer · commit 67bbe1e1bbb6 · 2024-01-29T22:00:20.000-06:00
diff --git a/wolfcrypt/src/rsa.c b/wolfcrypt/src/rsa.c
@@ -3141,7 +3141,9 @@ static int wc_RsaFunction_ex(const byte* in, word32 inLen, byte* out,
     }
 #endif
 
-#ifndef WOLF_CRYPTO_CB_ONLY_RSA
+#ifdef WOLF_CRYPTO_CB_ONLY_RSA
+    return NO_VALID_DEVID;
+#else /* !WOLF_CRYPTO_CB_ONLY_RSA */
     SAVE_VECTOR_REGISTERS(return _svr_ret;);
 
 #if !defined(WOLFSSL_RSA_VERIFY_ONLY) && !defined(TEST_UNPAD_CONSTANT_TIME) && \
@@ -3192,7 +3194,7 @@ static int wc_RsaFunction_ex(const byte* in, word32 inLen, byte* out,
         wc_RsaCleanup(key);
     }
     return ret;
-#endif /* WOLF_CRYPTO_CB_ONLY_RSA */
+#endif /* !WOLF_CRYPTO_CB_ONLY_RSA */
 }
 
 int wc_RsaFunction(const byte* in, word32 inLen, byte* out,

Original file line number	Diff line number	Diff line change
`@@ -3141,7 +3141,9 @@ static int wc_RsaFunction_ex(const byte* in, word32 inLen, byte* out,`
`3141`	`3141`	`}`
`3142`	`3142`	`#endif`
`3143`	`3143`
`3144`		`-#ifndef WOLF_CRYPTO_CB_ONLY_RSA`
	`3144`	`+#ifdef WOLF_CRYPTO_CB_ONLY_RSA`
	`3145`	`+ return NO_VALID_DEVID;`
	`3146`	`+#else /* !WOLF_CRYPTO_CB_ONLY_RSA */`
`3145`	`3147`	`SAVE_VECTOR_REGISTERS(return _svr_ret;);`
`3146`	`3148`
`3147`	`3149`	`#if !defined(WOLFSSL_RSA_VERIFY_ONLY) && !defined(TEST_UNPAD_CONSTANT_TIME) && \`
`@@ -3192,7 +3194,7 @@ static int wc_RsaFunction_ex(const byte* in, word32 inLen, byte* out,`
`3192`	`3194`	`wc_RsaCleanup(key);`
`3193`	`3195`	`}`
`3194`	`3196`	`return ret;`
`3195`		`-#endif /* WOLF_CRYPTO_CB_ONLY_RSA */`
	`3197`	`+#endif /* !WOLF_CRYPTO_CB_ONLY_RSA */`
`3196`	`3198`	`}`
`3197`	`3199`
`3198`	`3200`	`int wc_RsaFunction(const byte* in, word32 inLen, byte* out,`