Revert^2 "keystore2: cope with new curve25519 enum"

6c44cad429721ebaf2216d412aa7f9417936cd70

Change-Id: Ib0c57111991221d6117cf2e5e2e9af0a13ce167e
3 files changed