From d7b560f2aba1629b5dc0bf6190bd19cdfe4b7c96 Mon Sep 17 00:00:00 2001
From: David Garske <david@wolfssl.com>
Date: Wed, 30 May 2018 12:44:55 -0700
Subject: [PATCH] Fix for scan-build warning about value being stored and not
 used. Changed the `wc_RsaFunction` API to public. Added ability to expose
 `wc_RsaDirect` with new define `WC_RSA_DIRECT`.

---
 wolfcrypt/src/ecc.c     | 1 -
 wolfcrypt/src/rsa.c     | 4 ++--
 wolfssl/wolfcrypt/rsa.h | 6 +++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/wolfcrypt/src/ecc.c b/wolfcrypt/src/ecc.c
index d53847ae7..6bf7a5851 100755
--- a/wolfcrypt/src/ecc.c
+++ b/wolfcrypt/src/ecc.c
@@ -2802,7 +2802,6 @@ int wc_ecc_shared_secret(ecc_key* private_key, ecc_key* public_key, byte* out,
         err = wc_CryptoDev_Ecdh(private_key, public_key, out, outlen);
         if (err != NOT_COMPILED_IN)
             return err;
-        err = 0; /* reset error code and try using software */
     }
 #endif
 
diff --git a/wolfcrypt/src/rsa.c b/wolfcrypt/src/rsa.c
index 18045d47b..7d1055172 100644
--- a/wolfcrypt/src/rsa.c
+++ b/wolfcrypt/src/rsa.c
@@ -1517,7 +1517,7 @@ static int wc_RsaFunctionAsync(const byte* in, word32 inLen, byte* out,
 }
 #endif /* WOLFSSL_ASYNC_CRYPT && WC_ASYNC_ENABLE_RSA */
 
-#ifdef WC_RSA_NO_PADDING
+#if defined(WC_RSA_DIRECT) || defined(WC_RSA_NO_PADDING)
 /* Function that does the RSA operation directly with no padding.
  *
  * in       buffer to do operation on
@@ -1611,7 +1611,7 @@ int wc_RsaDirect(byte* in, word32 inLen, byte* out, word32* outSz,
 
     return ret;
 }
-#endif /* WC_RSA_NO_PADDING */
+#endif /* WC_RSA_DIRECT || WC_RSA_NO_PADDING */
 
 
 int wc_RsaFunction(const byte* in, word32 inLen, byte* out,
diff --git a/wolfssl/wolfcrypt/rsa.h b/wolfssl/wolfcrypt/rsa.h
index ecf41413d..e2337c77a 100644
--- a/wolfssl/wolfcrypt/rsa.h
+++ b/wolfssl/wolfcrypt/rsa.h
@@ -152,7 +152,7 @@ WOLFSSL_API int  wc_FreeRsaKey(RsaKey* key);
 WOLFSSL_LOCAL int wc_InitRsaHw(RsaKey* key);
 #endif /* WOLFSSL_XILINX_CRYPT */
 
-WOLFSSL_LOCAL int wc_RsaFunction(const byte* in, word32 inLen, byte* out,
+WOLFSSL_API int  wc_RsaFunction(const byte* in, word32 inLen, byte* out,
                            word32* outLen, int type, RsaKey* key, WC_RNG* rng);
 
 WOLFSSL_API int  wc_RsaPublicEncrypt(const byte* in, word32 inLen, byte* out,
@@ -238,9 +238,13 @@ WOLFSSL_API int  wc_RsaPrivateDecrypt_ex(const byte* in, word32 inLen,
 WOLFSSL_API int  wc_RsaPrivateDecryptInline_ex(byte* in, word32 inLen,
                       byte** out, RsaKey* key, int type, enum wc_HashType hash,
                       int mgf, byte* label, word32 lableSz);
+#if defined(WC_RSA_DIRECT) || defined(WC_RSA_NO_PADDING)
 WOLFSSL_API int wc_RsaDirect(byte* in, word32 inLen, byte* out, word32* outSz,
                    RsaKey* key, int type, WC_RNG* rng);
+#endif
+
 #endif /* HAVE_FIPS*/
+
 WOLFSSL_API int  wc_RsaFlattenPublicKey(RsaKey*, byte*, word32*, byte*,
                                                                        word32*);
 WOLFSSL_API int wc_RsaExportKey(RsaKey* key,