Merge pull request #332 from larseggert/rename-xor

Rename arguments to do_xor_iv to avoid clashing with a reserved keyword