feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Fix for FIPS v1 CAVP case so the wc_RsaExportKey and wc_CheckProbablePrime functions are available. Cleanup to remove unused ERROR_OUT.

Browse Source
This commit is contained in:
David Garske
2018-08-13 06:25:55 -06:00
parent bb574d28b2
commit 80e46253d9
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wolfcrypt/src/rsa.c
View File

@@ -200,8 +200,6 @@ int wc_RsaFlattenPublicKey(RsaKey* key, byte* a, word32* aSz, byte* b,
#include <wolfcrypt/src/misc.c> #include <wolfcrypt/src/misc.c>
#endif #endif
#define ERROR_OUT(x) { ret = (x); goto done;}
enum { enum {
RSA_STATE_NONE = 0, RSA_STATE_NONE = 0,
@@ -1513,7 +1511,7 @@ static int wc_RsaFunctionSync(const byte* in, word32 inLen, byte* out,
if (ret == 0 && mp_exptmod(tmp, &key->dP, &key->p, if (ret == 0 && mp_exptmod(tmp, &key->dP, &key->p,
tmpa) != MP_OKAY) tmpa) != MP_OKAY)
ret = MP_EXPTMOD_E; ret = MP_EXPTMOD_E;
/* tmpb = tmp^dQ mod q */ /* tmpb = tmp^dQ mod q */
if (ret == 0 && mp_exptmod(tmp, &key->dQ, &key->q, if (ret == 0 && mp_exptmod(tmp, &key->dQ, &key->q,
tmpb) != MP_OKAY) tmpb) != MP_OKAY)
@@ -2616,6 +2614,9 @@ int wc_RsaFlattenPublicKey(RsaKey* key, byte* e, word32* eSz, byte* n,
} }
#endif /* HAVE_FIPS */
static int RsaGetValue(mp_int* in, byte* out, word32* outSz) static int RsaGetValue(mp_int* in, byte* out, word32* outSz)
{ {
word32 sz; word32 sz;
@@ -2890,7 +2891,7 @@ int wc_CheckProbablePrime(const byte* pRaw, word32 pRawSz,
eRaw, eRawSz, nlen, isPrime, NULL); eRaw, eRawSz, nlen, isPrime, NULL);
} }
#if !defined(HAVE_FIPS) || (defined(HAVE_FIPS) && (HAVE_FIPS_VERSION >= 2))
/* Make an RSA key for size bits, with e specified, 65537 is a good e */ /* Make an RSA key for size bits, with e specified, 65537 is a good e */
int wc_MakeRsaKey(RsaKey* key, int size, long e, WC_RNG* rng) int wc_MakeRsaKey(RsaKey* key, int size, long e, WC_RNG* rng)
{ {
@@ -3087,6 +3088,7 @@ int wc_MakeRsaKey(RsaKey* key, int size, long e, WC_RNG* rng)
return 0; return 0;
} }
#endif /* !FIPS || FIPS_VER >= 2 */
#endif /* WOLFSSL_KEY_GEN */ #endif /* WOLFSSL_KEY_GEN */
@@ -3105,7 +3107,4 @@ int wc_RsaSetRNG(RsaKey* key, WC_RNG* rng)
#endif /* WC_RSA_BLINDING */ #endif /* WC_RSA_BLINDING */
#undef ERROR_OUT
#endif /* HAVE_FIPS */
#endif /* NO_RSA */ #endif /* NO_RSA */