Merge changes Ic3993c1f,I06645bb4

* changes:
  Generalize CryptoType infrastructure
  Refactor CryptoType to use better names, and size_t not uint32_t