add most encryption options to config

Change-Id: I5364bffe9952b181cbd7344c6fd75361868dc34c