Add PBKDF2 option for password hashing

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.

Author: LinuxJedi

configure.ac

@@ -332,6 +332,26 @@ then
     AM_CFLAGS="$AM_CFLAGS -DWOLFPKCS11_HKDF"
 fi
 
+AC_ARG_ENABLE([pbkdf2],
+    [AS_HELP_STRING([--enable-pbkdf2],[Enable internal PBKDF2 for PIN hashing (default: disabled)])],
+    [ ENABLED_PBKDF2=$enableval ],
+    [ ENABLED_PBKDF2=no ]
+    )
+if test "$ENABLED_PBKDF2" = "yes"
+then
+    AM_CFLAGS="$AM_CFLAGS -DWOLFPKCS11_PBKDF2"
+fi
+
+AC_ARG_WITH([pbkdf2-iterations],
+    [AS_HELP_STRING([--with-pbkdf2-iterations=NUM],[Set PBKDF2 iterations (default: 600000)])],
+    [ PBKDF2_ITERATIONS=$withval ],
+    [ PBKDF2_ITERATIONS=600000 ]
+    )
+if test "$ENABLED_PBKDF2" = "yes"
+then
+    AM_CFLAGS="$AM_CFLAGS -DPBKDF2_ITERATIONS=$PBKDF2_ITERATIONS"
+fi
+
 AC_ARG_ENABLE([md5],
     [AS_HELP_STRING([--enable-md5],[Enable MD5 (default: enabled)])],
     [ ENABLED_MD5=$enableval ],

src/internal.c

@@ -5739,17 +5739,22 @@ int WP11_Slot_HasSession(WP11_Slot* slot)
  *          -ve on failure.
  */
 static int HashPIN(char* pin, int pinLen, byte* seed, int seedLen, byte* hash,
-                   int hashLen)
+                   int hashLen, WP11_Slot* slot)
 {
-#ifdef HAVE_SCRYPT
+#ifdef WOLFPKCS11_PBKDF2
+        return wc_PBKDF2_ex(hash, (byte*)pin, pinLen, seed, seedLen,
+            PBKDF2_ITERATIONS, hashLen, WC_SHA256, NULL, slot->devId);
+#elif defined(HAVE_SCRYPT)
     /* Convert PIN into secret using scrypt algorithm. */
+    (void)slot;
     return wc_scrypt(hash, (byte*)pin, pinLen, seed, seedLen,
                                     WP11_HASH_PIN_COST, WP11_HASH_PIN_BLOCKSIZE,
                                     WP11_HASH_PIN_PARALLEL, hashLen);
 #elif !defined(NO_SHA256)
     /* fallback to simple SHA2-256 hash of pin */
     (void)seed;
     (void)seedLen;
+    (void)slot;
     XMEMSET(hash, 0, hashLen);
     return wc_Sha256Hash((const byte*)pin, pinLen, hash);
 #else
@@ -5759,6 +5764,7 @@ static int HashPIN(char* pin, int pinLen, byte* seed, int seedLen, byte* hash,
     (void)seedLen;
     (void)hash;
     (void)hashLen;
+    (void)slot;
     return NOT_COMPILED_IN;
 #endif
 }
@@ -5824,7 +5830,7 @@ int WP11_Slot_CheckSOPin(WP11_Slot* slot, char* pin, int pinLen)
 
         /* Costly Operation done out of lock. */
         ret = HashPIN(pin, pinLen, token->soPinSeed, sizeof(token->soPinSeed),
-                                                            hash, sizeof(hash));
+                                                    hash, sizeof(hash), slot);
 
         WP11_Lock_LockRO(&slot->lock);
     }
@@ -5864,7 +5870,7 @@ int WP11_Slot_CheckUserPin(WP11_Slot* slot, char* pin, int pinLen)
 
         /* Costly Operation done out of lock. */
         ret = HashPIN(pin, pinLen, token->userPinSeed,
-                                sizeof(token->userPinSeed), hash, sizeof(hash));
+                        sizeof(token->userPinSeed), hash, sizeof(hash), slot);
 
         WP11_Lock_LockRO(&slot->lock);
     }
@@ -6028,7 +6034,7 @@ int WP11_Slot_UserLogin(WP11_Slot* slot, char* pin, int pinLen)
     #ifndef WOLFPKCS11_NO_STORE
         if (ret == 0) {
             ret = HashPIN(pin, pinLen, token->seed, sizeof(token->seed),
-                token->key, sizeof(token->key));
+                token->key, sizeof(token->key), slot);
         }
     #endif
         WP11_Lock_LockRW(&slot->lock);
@@ -6100,7 +6106,7 @@ int WP11_Slot_SetSOPin(WP11_Slot* slot, char* pin, int pinLen)
         /* Costly Operation done out of lock. */
         ret = HashPIN(pin, pinLen, token->soPinSeed,
                                          sizeof(token->soPinSeed), token->soPin,
-                                         sizeof(token->soPin));
+                                         sizeof(token->soPin), slot);
         WP11_Lock_LockRW(&slot->lock);
     }
     if (ret == 0) {
@@ -6149,11 +6155,11 @@ int WP11_Slot_SetUserPin(WP11_Slot* slot, char* pin, int pinLen)
         token->userPinEmpty = 0;
         ret = HashPIN(pin, pinLen, token->userPinSeed,
                                      sizeof(token->userPinSeed), token->userPin,
-                                     sizeof(token->userPin));
+                                     sizeof(token->userPin), slot);
     #ifndef WOLFPKCS11_NO_STORE
         if (ret == 0) {
             ret = HashPIN(pin, pinLen, token->seed, sizeof(token->seed),
-                token->key, sizeof(token->key));
+                token->key, sizeof(token->key), slot);
         }
     #endif
         WP11_Lock_LockRW(&slot->lock);

wolfpkcs11/internal.h

@@ -41,6 +41,12 @@ extern "C" {
 
 #ifdef HAVE_FIPS
     #define NO_MD5
+    #define WOLFPKCS11_PBKDF2
+#endif
+
+/* FIPS has no scrypt and SHA256 is not strong enough */
+#ifndef PBKDF2_ITERATIONS
+    #define PBKDF2_ITERATIONS 600000
 #endif
 
 #ifdef WOLFPKCS11_NO_MD5