Added Diffie-Hellman support
Tweaked obnoxiously long XFORM defines