Merge pull request #1323 from JacobBarthelmeh/RSA-min

adjustment to RSA key size check
This commit is contained in:
John Safranek
2018-01-17 13:12:47 -08:00
committed by GitHub

View File

@ -2249,8 +2249,15 @@ static const byte lower_bound[] = {
}; };
/* returns 1 on key size ok and 0 if not ok */
static INLINE int RsaSizeCheck(int size) static INLINE int RsaSizeCheck(int size)
{ {
if (size < RSA_MIN_SIZE || size > RSA_MAX_SIZE) {
return 0;
}
#ifdef HAVE_FIPS
/* Key size requirements for CAVP */
switch (size) { switch (size) {
case 1024: case 1024:
case 2048: case 2048:
@ -2258,7 +2265,11 @@ static INLINE int RsaSizeCheck(int size)
case 4096: case 4096:
return 1; return 1;
} }
return 0; return 0;
#else
return 1; /* allow unusual key sizes in non FIPS mode */
#endif /* HAVE_FIPS */
} }