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

Fix missing RSA_MIN_SIZE and RSA_MAX_SIZE and case where HAVE_FIPS_VERSION is not defined.

Browse Source
This commit is contained in:
David Garske
2018-08-13 08:18:51 -06:00
parent 80e46253d9
commit 93a7b76da5
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wolfcrypt/src/rsa.c
View File

@ -2891,7 +2891,8 @@ 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)) #if !defined(HAVE_FIPS) || (defined(HAVE_FIPS) && \
defined(HAVE_FIPS_VERSION) && (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)
{ {

8
wolfssl/wolfcrypt/rsa.h
View File

@ -70,6 +70,11 @@
extern "C" { extern "C" {
#endif #endif
enum {
RSA_MIN_SIZE = 512,
RSA_MAX_SIZE = 4096,
};
/* avoid redefinition of structs */ /* avoid redefinition of structs */
#if !defined(HAVE_FIPS) || \ #if !defined(HAVE_FIPS) || \
(defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2)) (defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2))
@ -94,9 +99,6 @@ enum {
RSA_BLOCK_TYPE_1 = 1, RSA_BLOCK_TYPE_1 = 1,
RSA_BLOCK_TYPE_2 = 2, RSA_BLOCK_TYPE_2 = 2,
RSA_MIN_SIZE = 512,
RSA_MAX_SIZE = 4096,
RSA_MIN_PAD_SZ = 11, /* separator + 0 + pad value + 8 pads */ RSA_MIN_PAD_SZ = 11, /* separator + 0 + pad value + 8 pads */
RSA_PSS_PAD_SZ = 8, RSA_PSS_PAD_SZ = 8,