From 67bbe1e1bbb632abf3aaaae532606cc34d671c0c Mon Sep 17 00:00:00 2001 From: Daniel Pouzzner Date: Mon, 29 Jan 2024 22:00:20 -0600 Subject: [PATCH] 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. --- wolfcrypt/src/rsa.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wolfcrypt/src/rsa.c b/wolfcrypt/src/rsa.c index 301139df2..56a6efa83 100644 --- 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,