[Issue 9364] Rework encryption API