This should definitely use the new crypto functions.