Updated to include CAST-128