Switch to HKDF instead of PBKDF2