Pkeyauth merge in OSXUniversal.

Do you need something different for ipad?