Compile errors when building with --disable-curve25519
On current git master.