The code to be merged has been tested and worked fine. Also the code looks ok. A few minor issues below. On 02.03.2012, at 19:08, Diego Biurrun wrote: > Diego Biurrun has proposed merging lp:~hipl-core/hipl/certificate-exchange > into lp:hipl. > === modified file 'hipfw/main.c' > --- hipfw/main.c 2011-11-25 13:52:20 +0000 > +++ hipfw/main.c 2012-03-02 18:07:40 +0000 > @@ -37,14 +37,16 @@ > > #include <stdio.h> > #include <stdlib.h> > +#include <string.h> > #include <unistd.h> > #include <sys/types.h> > > #include "lib/core/filemanip.h" > #include "lib/core/debug.h" > #include "lib/core/util.h" > +#include "cert.h" > +#include "conntrack.h" > #include "hipfw.h" > -#include "conntrack.h" > #include "midauth.h" Why was cert.h included here? -> Removed in new revision. > === modified file 'modules/update/hipd/update.c' > --- modules/update/hipd/update.c 2012-01-17 08:34:18 +0000 > +++ modules/update/hipd/update.c 2012-03-02 18:07:40 +0000 > @@ -57,6 +57,7 @@ > #include "lib/core/prefix.h" > #include "lib/core/state.h" > #include "lib/core/performance.h" > +#include "modules/cert/hipd/cert.h" > #include "update_builder.h" > #include "update_locator.h" > #include "update_param_handling.h" Why was this include added? -> Removed in new revision. -- Dipl.-Inform. Rene Hummen, Ph.D. Student Chair of Communication and Distributed Systems RWTH Aachen University, Germany tel: +49 241 80 20772 web: http://www.comsys.rwth-aachen.de/team/rene-hummen/ -- https://code.launchpad.net/~hipl-core/hipl/certificate-exchange/+merge/95634 Your team HIPL core team is subscribed to branch lp:hipl.