Crypto refactoring

6roebert requested to merge crypto-refactoring into full-crypto-support Apr 19, 2021