Merge "Keystore: Validate curve names in XDH and ED25519" into main