Make Apple Keychain format more robust#5978

kholia wants to merge 1 commit intobleeding-jumboopenwall/john:bleeding-jumbofrom

better-apple-keychain-supportopenwall/john:better-apple-keychain-supportCopy head branch name to clipboard