Reincorporate crypto changes

Commit

4 years ago

Reincorporate crypto changes https://github.com/matrix-org/matrix-js-sdk/pull/1697