-revert 'optimization' that broke test_crypto_hkdf

git-svn-id: https://gnunet.org/svn/gnunet@31858 140774ce-b5e7-0310-ab8b-a85725594a96
renaming states according to naming convenations


git-svn-id: https://gnunet.org/svn/gnunet@31859 140774ce-b5e7-0310-ab8b-a85725594a96