It's time to wrap this up. I did not detect any difference in leak counts when running valgrind through hipd or when running the unit tests through valgrind. I am going to merge this code because checking of memory leaks was the remaining task. -- https://code.launchpad.net/~hipl-core/hipl/hipv2-dh-ecdh/+merge/131786 Your team HIPL core team is subscribed to branch lp:hipl.