Add PBKDF2 in FIPS for password hashing #134
Conversation
wolfpkcs11/internal.h
Outdated
| #define NO_MD5 | ||
| #endif | ||
|
|
||
| /* FIPSv5 has no scrypt or pbkdf2 and SHA256 is not strong enough */ |
There was a problem hiding this comment.
Just make this the default for FIPS, since scrypt won't be in the boundary in any planned version. Also FIPS v6.0 is dev now, but it will move later.
src/internal.c
Outdated
| enum wc_HashType hashT; | ||
|
|
||
| #ifdef HAVE_FIPS | ||
| if (kLen < HMAC_FIPS_MIN_KEY) |
There was a problem hiding this comment.
Add some more logging here as this error will be hit often.
src/internal.c
Outdated
| #endif | ||
|
|
||
| hashT = wc_HashTypeConvert(hashType); | ||
| hLen = wc_HashGetDigestSize(hashT); |
There was a problem hiding this comment.
Consider adding error check for hLen here
SparkiDev
left a comment
SparkiDev
left a comment
There was a problem hiding this comment.
PBKDF2 is a FIPS algorithm.
Use wolfSSL API.
We can't, it isn't FIPSv5. It was concluded in an engineering call that this would be OK. Is it not? |
LinuxJedi
changed the title
FIPS doesn't have scrypt. This implements PBKDF2 instead. Enabled by default at 600,000 rounds for FIPS. 600,000 being the current OWASP recommendation for SHA256 HMAC.
|
Moved to use wolfSSL's PBKDF2, it does actually exist in FIPSv5 builds.
|
| int hashLen, WP11_Slot* slot) | ||
| { | ||
| #ifdef HAVE_SCRYPT | ||
| #ifdef HAVE_FIPS |
There was a problem hiding this comment.
Consider adding a new macro for force this mode as well... There are many embedded systems that would prefer this as scrypt is a memory hog (like 1 MB).
| #endif | ||
|
|
||
| /* FIPS has no scrypt and SHA256 is not strong enough */ | ||
| #if defined(HAVE_FIPS) |
There was a problem hiding this comment.
Change to #ifndef PBKDF2_ITERATIONS.
|
After discussions with @kaleb-himes and @MarkAtwood, we won't be doing this. |
4 participants
FIPS doesn't have scrypt. This implements PBKDF2 instead. Enabled by default at 600,000 rounds for FIPS.
600,000 being the current OWASP recommendation for SHA256 HMAC.