Minor cleanup.
Add the macro NO_CRYPTO back and fix the version macro in header file.