re-enable post-SRP stuff, make xor() work on py3