fix some crypto logic
Merge branch 'master' of https://github.com/SocietyPro/Cambrian-src

Conflicts:
	ICrypto.cpp
	Xcp.cpp