Rename the super confusing SHA2 macro in pbkdf2-hmac-sha1 to "SHA1short".
Also apply the recent bugfix to CUDA and CPU code too.