Replying to my own comment because I can no longer edit:<p>Looks like KeePass guys are going to add Argon2 and have already added authenticated encryption.<p>Keep an eye on it. Might be worth moving to.<p><a href="http:&#x2F;&#x2F;ehc.ac&#x2F;p&#x2F;keepass&#x2F;discussion&#x2F;329220&#x2F;thread&#x2F;a48066c0&#x2F;?limit=250" rel="nofollow">http:&#x2F;&#x2F;ehc.ac&#x2F;p&#x2F;keepass&#x2F;discussion&#x2F;329220&#x2F;thread&#x2F;a48066c0&#x2F;?l...</a>