Merge pull request #992 from reaperhulk/fix-ecdh

ECDH wasn't actually included so it wasn't being compiled