Osx pkeyauth merge