RT2626: sha256 and 2K keys.

Cherry-picked from Kurt's full fix in master