-simplify logic

git-svn-id: https://gnunet.org/svn/gnunet@34468 140774ce-b5e7-0310-ab8b-a85725594a96
-simplify logic, eleminate dead code

git-svn-id: https://gnunet.org/svn/gnunet@34469 140774ce-b5e7-0310-ab8b-a85725594a96
allocate r and r_prime MPIs before use

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