Apple rehires software security expert Jon Callas