removed superfluous code

git-svn-id: https://www.ocp.inf.ethz.ch/svn/aos/trunk@5873 8c9fc860-2736-0410-a75d-ab315db34111
changed cipher order

git-svn-id: https://www.ocp.inf.ethz.ch/svn/aos/trunk@5874 8c9fc860-2736-0410-a75d-ab315db34111
renamed key files & increased verbosity

git-svn-id: https://www.ocp.inf.ethz.ch/svn/aos/trunk@5875 8c9fc860-2736-0410-a75d-ab315db34111
add forgotten file

git-svn-id: https://www.ocp.inf.ethz.ch/svn/aos/trunk@5876 8c9fc860-2736-0410-a75d-ab315db34111
revert to the accidently overwitten rev. 5874

git-svn-id: https://www.ocp.inf.ethz.ch/svn/aos/trunk@5877 8c9fc860-2736-0410-a75d-ab315db34111