lib: Add authentication functions

Adds functions needed for authentication using X509 certificates,
implemented using OpenSSL.

Refactors some library internals, and adds some unit tests for them.

Signed-off-by: Dimitri Staessens <dimitri@ouroboros.rocks>
Signed-off-by: Sander Vrijders <sander@ouroboros.rocks>

8 files changed, 140 insertions, 132 deletions

diff --git a/src/irmd/ipcp.c b/src/irmd/ipcp.c
index 5a9a79d3..28f870a7 100644
--- a/src/irmd/ipcp.c
+++ b/src/irmd/ipcp.c
@@ -83,7 +83,7 @@ ipcp_msg_t * send_recv_ipcp_msg(pid_t        pid,
 {
         int             sockfd;
         uint8_t         buf[SOCK_BUF_SIZE];
-        char *          sock_path;
+        char *          spath;
         ssize_t         len;
         ipcp_msg_t *    recv_msg;
         struct timeval  tv;
@@ -94,17 +94,17 @@ ipcp_msg_t * send_recv_ipcp_msg(pid_t        pid,
         if (kill(pid, 0) < 0)
                 return NULL;
 
-        sock_path = ipcp_sock_path(pid);
-        if (sock_path == NULL)
+        spath = sock_path(pid, IPCP_SOCK_PATH_PREFIX);
+        if (spath == NULL)
                 return NULL;
 
-        sockfd = client_socket_open(sock_path);
+        sockfd = client_socket_open(spath);
         if (sockfd < 0) {
-                free(sock_path);
+                free(spath);
                 return NULL;
         }
 
-        free(sock_path);
+        free(spath);
 
         len = ipcp_msg__get_packed_size(msg);
         if (len == 0 || len >= SOCK_BUF_SIZE) {
diff --git a/src/irmd/main.c b/src/irmd/main.c
index cc15078f..cf079698 100644
--- a/src/irmd/main.c
+++ b/src/irmd/main.c
@@ -72,7 +72,6 @@
 #define IPCP_HASH_LEN(p)   hash_len((p)->dir_hash_algo)
 #define BIND_TIMEOUT       10   /* ms */
 #define DEALLOC_TIME       300  /*  s */
-#define MSGBUFSZ           2048
 
 enum irm_state {
         IRMD_NULL = 0,
@@ -1024,7 +1023,6 @@ static int flow_alloc(struct flow_info * flow,
 
         log_info("Allocating flow for %d to %s.", flow->n_pid, dst);
 
-
         if (flow->qs.cypher_s > 0) {
                 ssize_t key_len;
 
@@ -1380,7 +1378,7 @@ static irm_msg_t * do_command_msg(irm_msg_t * msg)
                 res = disconnect_ipcp(msg->pid, msg->dst, msg->comp);
                 break;
         case IRM_MSG_CODE__IRM_BIND_PROGRAM:
-                /* Make exec NULL terminated instead of empty string terminated */
+                /* Terminate with NULL instead of "" */
                 free(msg->exec[msg->n_exec - 1]);
                 msg->exec[msg->n_exec - 1] = NULL;
                 res = bind_program(msg->exec, msg->name, msg->opts);
@@ -1540,7 +1538,7 @@ static void * mainloop(void * o)
                         continue;
                 }
 
-                tpm_dec(irmd.tpm);
+                tpm_begin_work(irmd.tpm);
 
                 pthread_cleanup_push(__cleanup_close_ptr, &sfd);
                 pthread_cleanup_push(free_msg, msg);
@@ -1556,12 +1554,12 @@ static void * mainloop(void * o)
                 }
 
                 if (ret_msg->result == -EPIPE) {
-                        log_dbg("Terminated command: application closed socket.");
+                        log_dbg("Terminated command: remote closed socket.");
                         goto fail;
                 }
 
                 if (ret_msg->result == -EIRMD) {
-                        log_dbg("Terminated command: IRMd not in running state.");
+                        log_dbg("Terminated command: IRMd not running.");
                         goto fail;
                 }
 
@@ -1596,14 +1594,14 @@ static void * mainloop(void * o)
                 pthread_cleanup_pop(true);
                 pthread_cleanup_pop(true);
 
-                tpm_inc(irmd.tpm);
+                tpm_end_work(irmd.tpm);
 
                 continue;
  fail:
                 irm_msg__free_unpacked(ret_msg, NULL);
  fail_msg:
                 close(sfd);
-                tpm_inc(irmd.tpm);
+                tpm_end_work(irmd.tpm);
                 continue;
         }
 
diff --git a/src/irmd/reg/proc.h b/src/irmd/reg/proc.h
index 99f74fef..499ecc72 100644
--- a/src/irmd/reg/proc.h
+++ b/src/irmd/reg/proc.h
@@ -32,8 +32,8 @@ struct reg_proc {
 
         struct proc_info      info;
 
-        struct list_head      names;   /* names for which process accepts flows */
-        size_t                n_names; /* number of names                       */
+        struct list_head      names;   /* process accepts flows for names */
+        size_t                n_names; /* number of names                 */
 
         struct shm_flow_set * set;
 };
diff --git a/src/irmd/reg/tests/flow_test.c b/src/irmd/reg/tests/flow_test.c
index f9d23fd1..3e586341 100644
--- a/src/irmd/reg/tests/flow_test.c
+++ b/src/irmd/reg/tests/flow_test.c
@@ -28,7 +28,7 @@
 
 #define TEST_DATA "testpiggybackdata"
 
-static int test_reg_flow_create(void)
+static int test_reg_flow_create_destroy(void)
 {
         struct reg_flow * f;
 
@@ -51,10 +51,10 @@ static int test_reg_flow_create(void)
 
         TEST_SUCCESS();
 
-        return 0;
+        return TEST_RC_SUCCESS;
  fail:
         TEST_FAIL();
-        return -1;
+        return TEST_RC_FAIL;
 }
 
 static int test_reg_flow_create_no_id(void) {
@@ -67,7 +67,7 @@ static int test_reg_flow_create_no_id(void) {
 
         reg_flow_create(&info); /* assert fail */
 
-        return 0;
+        return TEST_RC_SUCCESS;
 }
 
 static int test_reg_flow_create_no_pid(void) {
@@ -80,7 +80,7 @@ static int test_reg_flow_create_no_pid(void) {
 
         reg_flow_create(&info); /* assert fail */
 
-        return 0;
+        return TEST_RC_SUCCESS;
 }
 
 static int test_reg_flow_create_has_n_1_pid(void) {
@@ -94,7 +94,7 @@ static int test_reg_flow_create_has_n_1_pid(void) {
 
         reg_flow_create(&info); /* assert fail */
 
-        return 0;
+        return TEST_RC_SUCCESS;
 }
 
 static int test_reg_flow_create_wrong_state(void) {
@@ -108,7 +108,7 @@ static int test_reg_flow_create_wrong_state(void) {
 
         reg_flow_create(&info); /* assert fail */
 
-        return 0;
+        return TEST_RC_SUCCESS;
 }
 
 static int test_reg_flow_create_has_mpl(void) {
@@ -123,7 +123,7 @@ static int test_reg_flow_create_has_mpl(void) {
 
         reg_flow_create(&info); /* assert fail */
 
-        return 0;
+        return TEST_RC_SUCCESS;
 }
 
 static int test_reg_flow_update(void)
@@ -163,10 +163,10 @@ static int test_reg_flow_update(void)
 
         TEST_SUCCESS();
 
-        return 0;
+        return TEST_RC_SUCCESS;
  fail:
         TEST_FAIL();
-        return -1;
+        return TEST_RC_FAIL;
 }
 
 static int test_reg_flow_update_wrong_id(void)
@@ -199,10 +199,10 @@ static int test_reg_flow_update_wrong_id(void)
 
         TEST_SUCCESS();
 
-        return 0;
+        return TEST_RC_SUCCESS;
  fail:
         TEST_FAIL();
-        return -1;
+        return TEST_RC_FAIL;
 }
 
 static int test_reg_flow_assert_fails(void)
@@ -210,15 +210,10 @@ static int test_reg_flow_assert_fails(void)
         int ret = 0;
 
         ret |= test_assert_fail(test_reg_flow_create_no_id);
-
         ret |= test_assert_fail(test_reg_flow_create_no_pid);
-
         ret |= test_assert_fail(test_reg_flow_create_has_n_1_pid);
-
         ret |= test_assert_fail(test_reg_flow_create_wrong_state);
-
         ret |= test_assert_fail(test_reg_flow_create_has_mpl);
-
         ret |= test_assert_fail(test_reg_flow_update_wrong_id);
 
         return ret;
@@ -267,11 +262,11 @@ static int test_flow_data(void)
 
         TEST_SUCCESS();
 
-        return 0;
+        return TEST_RC_SUCCESS;
  fail:
         free(data);
         TEST_FAIL();
-        return -1;
+        return TEST_RC_FAIL;
 }
 
 int flow_test(int     argc,
@@ -282,12 +277,9 @@ int flow_test(int     argc,
         (void) argc;
         (void) argv;
 
-        ret |= test_reg_flow_create();
-
+        ret |= test_reg_flow_create_destroy();
         ret |= test_reg_flow_update();
-
         ret |= test_reg_flow_assert_fails();
-
         ret |= test_flow_data();
 
         return ret;
diff --git a/src/irmd/reg/tests/name_test.c b/src/irmd/reg/tests/name_test.c
index 48f132e9..64635eec 100644
--- a/src/irmd/reg/tests/name_test.c
+++ b/src/irmd/reg/tests/name_test.c
@@ -20,8 +20,11 @@
  * Foundation, Inc., http://www.fsf.org/about/contact/.
  */
 
+
 #include "../name.c"
 
+#include <ouroboros/test.h>
+
 #define TEST_PID  65534
 #define TEST_PROG "/usr/bin/testprog"
 #define TEST_NAME "testservicename"
@@ -34,6 +37,8 @@ static int test_reg_name_create(void)
                 .pol_lb = LB_RR,
         };
 
+        TEST_START();
+
         n = reg_name_create(&info);
         if (n == NULL) {
                 printf("Failed to create name %s.\n", info.name);
@@ -42,9 +47,12 @@ static int test_reg_name_create(void)
 
         reg_name_destroy(n);
 
-        return 0;
+        TEST_SUCCESS();
+
+        return TEST_RC_SUCCESS;
  fail:
-        return -1;
+        TEST_FAIL();
+        return TEST_RC_FAIL;
 }
 
 static int test_reg_name_add_proc(void)
@@ -55,6 +63,8 @@ static int test_reg_name_add_proc(void)
                 .pol_lb = LB_RR,
         };
 
+        TEST_START();
+
         n = reg_name_create(&info);
         if (n == NULL) {
                 printf("Failed to create name %s.\n", info.name);
@@ -85,9 +95,12 @@ static int test_reg_name_add_proc(void)
 
         reg_name_destroy(n);
 
-        return 0;
+        TEST_SUCCESS();
+
+        return TEST_RC_SUCCESS;
  fail:
-        return -1;
+        TEST_FAIL();
+        return TEST_RC_FAIL;
 }
 
 static int test_reg_name_add_prog(void)
@@ -100,6 +113,8 @@ static int test_reg_name_add_prog(void)
 
         char * exec[] = { TEST_PROG, "--argswitch", "argvalue", NULL};
 
+        TEST_START();
+
         n = reg_name_create(&info);
         if (n == NULL) {
                 printf("Failed to create name %s.\n", info.name);
@@ -130,9 +145,12 @@ static int test_reg_name_add_prog(void)
 
         reg_name_destroy(n);
 
-        return 0;
+        TEST_SUCCESS();
+
+        return TEST_RC_SUCCESS;
  fail:
-        return -1;
+        TEST_FAIL();
+        return TEST_RC_FAIL;
 }
 
 static int test_reg_name_add_active(enum pol_balance lb)
@@ -144,6 +162,8 @@ static int test_reg_name_add_active(enum pol_balance lb)
                 .pol_lb = lb,
         };
 
+        TEST_START();
+
         n = reg_name_create(&info);
         if (n == NULL) {
                 printf("Failed to create name %s.\n", info.name);
@@ -255,9 +275,12 @@ static int test_reg_name_add_active(enum pol_balance lb)
 
         reg_name_destroy(n);
 
-        return 0;
+        TEST_SUCCESS();
+
+        return TEST_RC_SUCCESS;
  fail:
-        return -1;
+        TEST_FAIL();
+        return TEST_RC_FAIL;
 }
 
 
@@ -270,13 +293,9 @@ int name_test(int     argc,
         (void) argv;
 
         res |= test_reg_name_create();
-
         res |= test_reg_name_add_proc();
-
         res |= test_reg_name_add_prog();
-
         res |= test_reg_name_add_active(LB_RR);
-
         res |= test_reg_name_add_active(LB_SPILL);
 
         return res;
diff --git a/src/irmd/reg/tests/proc_test.c b/src/irmd/reg/tests/proc_test.c
index 5c9dd865..df0527fb 100644
--- a/src/irmd/reg/tests/proc_test.c
+++ b/src/irmd/reg/tests/proc_test.c
@@ -22,10 +22,12 @@
 
 #include "../proc.c"
 
+#include <ouroboros/test.h>
+
 #define TEST_PID  65534
 #define TEST_PROG "usr/bin/testprog"
 
-static int test_reg_proc_create(void)
+static int test_reg_proc_create_destroy(void)
 {
         struct reg_proc * proc;
         struct proc_info  info = {
@@ -33,6 +35,8 @@ static int test_reg_proc_create(void)
                 .prog = TEST_PROG
         };
 
+        TEST_START();
+
         proc = reg_proc_create(&info);
         if (proc == NULL) {
                 printf("Failed to create proc.\n");
@@ -41,9 +45,12 @@ static int test_reg_proc_create(void)
 
         reg_proc_destroy(proc);
 
-        return 0;
+        TEST_SUCCESS();
+
+        return TEST_RC_SUCCESS;
  fail:
-        return -1;
+        TEST_FAIL();
+        return TEST_RC_FAIL;
 }
 
 static int test_reg_proc_add_name(void)
@@ -56,6 +63,8 @@ static int test_reg_proc_add_name(void)
 
         char * name = "testname";
 
+        TEST_START();
+
         proc = reg_proc_create(&info);
         if (proc == NULL) {
                 printf("Failed to create proc.\n");
@@ -86,9 +95,12 @@ static int test_reg_proc_add_name(void)
 
         reg_proc_destroy(proc);
 
-        return 0;
+        TEST_SUCCESS();
+
+        return TEST_RC_SUCCESS;
  fail:
-        return -1;
+        TEST_FAIL();
+        return TEST_RC_FAIL;
 }
 
 int proc_test(int     argc,
@@ -99,8 +111,7 @@ int proc_test(int     argc,
         (void) argc;
         (void) argv;
 
-        res |= test_reg_proc_create();
-
+        res |= test_reg_proc_create_destroy();
         res |= test_reg_proc_add_name();
 
         return res;
diff --git a/src/irmd/reg/tests/prog_test.c b/src/irmd/reg/tests/prog_test.c
index 5e6931d8..c394c222 100644
--- a/src/irmd/reg/tests/prog_test.c
+++ b/src/irmd/reg/tests/prog_test.c
@@ -22,8 +22,9 @@
 
 #include "../prog.c"
 
-#define TEST_PROG "usr/bin/testprog"
+#include <ouroboros/test.h>
 
+#define TEST_PROG "usr/bin/testprog"
 
 static int test_reg_prog_create(void)
 {
@@ -32,6 +33,8 @@ static int test_reg_prog_create(void)
                 .name = TEST_PROG
         };
 
+        TEST_START();
+
         prog = reg_prog_create(&info);
         if (prog == NULL) {
                 printf("Failed to create prog.\n");
@@ -40,9 +43,12 @@ static int test_reg_prog_create(void)
 
         reg_prog_destroy(prog);
 
-        return 0;
+        TEST_SUCCESS();
+
+        return TEST_RC_SUCCESS;
  fail:
-        return -1;
+        TEST_FAIL();
+        return TEST_RC_FAIL;
 }
 
 static int test_reg_prog_add_name(void)
@@ -54,6 +60,8 @@ static int test_reg_prog_add_name(void)
 
         char * name = "testname";
 
+        TEST_START();
+
         prog = reg_prog_create(&info);
         if (prog == NULL) {
                 printf("Failed to create prog.\n");
@@ -84,9 +92,12 @@ static int test_reg_prog_add_name(void)
 
         reg_prog_destroy(prog);
 
-        return 0;
+        TEST_SUCCESS();
+
+        return TEST_RC_SUCCESS;
  fail:
-        return -1;
+        TEST_FAIL();
+        return TEST_RC_FAIL;
 }
 
 int prog_test(int     argc,
@@ -98,7 +109,6 @@ int prog_test(int     argc,
         (void) argv;
 
         ret |= test_reg_prog_create();
-
         ret |= test_reg_prog_add_name();
 
         return ret;
diff --git a/src/irmd/reg/tests/reg_test.c b/src/irmd/reg/tests/reg_test.c
index c341c297..80fc64d6 100644
--- a/src/irmd/reg/tests/reg_test.c
+++ b/src/irmd/reg/tests/reg_test.c
@@ -51,10 +51,10 @@ static int test_reg_init(void)
 
         TEST_SUCCESS();
 
-        return 0;
+        return TEST_RC_SUCCESS;
  fail:
         REG_TEST_FAIL();
-        return -1;
+        return TEST_RC_FAIL;
 }
 
 static int test_reg_create_flow(void)
@@ -105,10 +105,10 @@ static int test_reg_create_flow(void)
 
         TEST_SUCCESS();
 
-        return 0;
+        return TEST_RC_SUCCESS;
  fail:
         REG_TEST_FAIL();
-        return -1;
+        return TEST_RC_FAIL;
 }
 
 static int test_reg_allocate_flow_timeout(void)
@@ -179,10 +179,10 @@ static int test_reg_allocate_flow_timeout(void)
 
         TEST_SUCCESS();
 
-        return 0;
+        return TEST_RC_SUCCESS;
  fail:
         REG_TEST_FAIL();
-        return -1;
+        return TEST_RC_FAIL;
 }
 
 static void * test_flow_respond_alloc(void * o)
@@ -321,10 +321,10 @@ static int test_reg_accept_flow_success(void)
 
         TEST_SUCCESS();
 
-        return 0;
+        return TEST_RC_SUCCESS;
  fail:
         REG_TEST_FAIL();
-        return -1;
+        return TEST_RC_FAIL;
 }
 
 static int test_reg_accept_flow_success_no_crypt(void)
@@ -416,10 +416,10 @@ static int test_reg_accept_flow_success_no_crypt(void)
 
         TEST_SUCCESS();
 
-        return 0;
+        return TEST_RC_SUCCESS;
  fail:
         REG_TEST_FAIL();
-        return -1;
+        return TEST_RC_FAIL;
 }
 
 
@@ -486,23 +486,19 @@ static int test_reg_allocate_flow_fail(void)
 
         TEST_SUCCESS();
 
-        return 0;
+        return TEST_RC_SUCCESS;
  fail:
         REG_TEST_FAIL();
-        return -1;
+        return TEST_RC_FAIL;
 }
 
 static int test_reg_flow(void) {
         int ret = 0;
 
         ret |= test_reg_create_flow();
-
         ret |= test_reg_allocate_flow_timeout();
-
         ret |= test_reg_accept_flow_success();
-
         ret |= test_reg_accept_flow_success_no_crypt();
-
         ret |= test_reg_allocate_flow_fail();
 
         return ret;
@@ -552,10 +548,10 @@ static int test_reg_create_ipcp(void)
 
         TEST_SUCCESS();
 
-        return 0;
+        return TEST_RC_SUCCESS;
  fail:
         REG_TEST_FAIL();
-        return -1;
+        return TEST_RC_FAIL;
 }
 
 static int test_set_layer(void)
@@ -614,10 +610,10 @@ static int test_set_layer(void)
 
         TEST_SUCCESS();
 
-        return 0;
+        return TEST_RC_SUCCESS;
  fail:
         REG_TEST_FAIL();
-        return -1;
+        return TEST_RC_FAIL;
 }
 
 static int test_reg_ipcp(void)
@@ -625,7 +621,6 @@ static int test_reg_ipcp(void)
         int ret = 0;
 
         ret |= test_reg_create_ipcp();
-
         ret |= test_set_layer();
 
         return ret;
@@ -674,10 +669,10 @@ static int test_reg_create_name(void)
 
         TEST_SUCCESS();
 
-        return 0;
+        return TEST_RC_SUCCESS;
  fail:
         REG_TEST_FAIL();
-        return -1;
+        return TEST_RC_FAIL;
 }
 
 static int test_reg_name(void)
@@ -732,10 +727,10 @@ static int test_reg_create_proc(void)
 
         TEST_SUCCESS();
 
-        return 0;
+        return TEST_RC_SUCCESS;
  fail:
         REG_TEST_FAIL();
-        return -1;
+        return TEST_RC_FAIL;
 }
 
 static int test_reg_proc(void)
@@ -785,10 +780,10 @@ static int test_reg_spawned(void)
 
         TEST_SUCCESS();
 
-        return 0;
+        return TEST_RC_SUCCESS;
  fail:
         REG_TEST_FAIL();
-        return -1;
+        return TEST_RC_FAIL;
 }
 
 static int test_reg_create_prog(void)
@@ -833,10 +828,10 @@ static int test_reg_create_prog(void)
 
         TEST_SUCCESS();
 
-        return 0;
+        return TEST_RC_SUCCESS;
  fail:
         REG_TEST_FAIL();
-        return -1;
+        return TEST_RC_FAIL;
 }
 
 static int test_reg_prog(void)
@@ -900,10 +895,10 @@ static int test_bind_proc(void)
 
         TEST_SUCCESS();
 
-        return 0;
+        return TEST_RC_SUCCESS;
 fail:
         REG_TEST_FAIL();
-        return -1;
+        return TEST_RC_FAIL;
 }
 
 static int test_bind_prog(void)
@@ -989,10 +984,10 @@ static int test_bind_prog(void)
 
         TEST_SUCCESS();
 
-        return 0;
+        return TEST_RC_SUCCESS;
 fail:
         REG_TEST_FAIL();
-        return -1;
+        return TEST_RC_FAIL;
 }
 
 static int test_inherit_prog(void)
@@ -1060,10 +1055,10 @@ static int test_inherit_prog(void)
 
         TEST_SUCCESS();
 
-        return 0;
+        return TEST_RC_SUCCESS;
 fail:
         REG_TEST_FAIL();
-        return -1;
+        return TEST_RC_FAIL;
 }
 
 static int test_wait_accepting_timeout(void)
@@ -1106,10 +1101,10 @@ static int test_wait_accepting_timeout(void)
 
         TEST_SUCCESS();
 
-        return 0;
+        return TEST_RC_SUCCESS;
  fail:
         REG_TEST_FAIL();
-        return -1;
+        return TEST_RC_FAIL;
 }
 
 static int test_wait_accepting_fail_name(void)
@@ -1140,10 +1135,10 @@ static int test_wait_accepting_fail_name(void)
 
         TEST_SUCCESS();
 
-        return 0;
+        return TEST_RC_SUCCESS;
  fail:
         REG_TEST_FAIL();
-        return -1;
+        return TEST_RC_FAIL;
 }
 
 static void * test_call_flow_accept(void * o)
@@ -1242,10 +1237,10 @@ static int test_wait_accepting_success(void)
 
         TEST_SUCCESS();
 
-        return 0;
+        return TEST_RC_SUCCESS;
  fail:
         REG_TEST_FAIL();
-        return -1;
+        return TEST_RC_FAIL;
 }
 
 static int test_wait_accepting(void)
@@ -1253,9 +1248,7 @@ static int test_wait_accepting(void)
         int ret = 0;
 
         ret |= test_wait_accepting_timeout();
-
         ret |= test_wait_accepting_fail_name();
-
         ret |= test_wait_accepting_success();
 
         return ret;
@@ -1300,10 +1293,10 @@ static int test_wait_ipcp_boot_timeout(void)
 
         TEST_SUCCESS();
 
-        return 0;
+        return TEST_RC_SUCCESS;
  fail:
         REG_TEST_FAIL();
-        return -1;
+        return TEST_RC_FAIL;
 }
 
 static void * test_ipcp_respond(void * o)
@@ -1371,10 +1364,10 @@ static int test_wait_ipcp_boot_fail(void)
 
         TEST_SUCCESS();
 
-        return 0;
+        return TEST_RC_SUCCESS;
  fail:
         REG_TEST_FAIL();
-        return -1;
+        return TEST_RC_FAIL;
 }
 
 static int test_wait_ipcp_boot_success(void)
@@ -1433,10 +1426,10 @@ static int test_wait_ipcp_boot_success(void)
 
         TEST_SUCCESS();
 
-        return 0;
+        return TEST_RC_SUCCESS;
  fail:
         REG_TEST_FAIL();
-        return -1;
+        return TEST_RC_FAIL;
 }
 
 static int test_wait_ipcp_boot(void)
@@ -1444,9 +1437,7 @@ static int test_wait_ipcp_boot(void)
         int ret = 0;
 
         ret |= test_wait_ipcp_boot_timeout();
-
         ret |= test_wait_ipcp_boot_fail();
-
         ret |= test_wait_ipcp_boot_success();
 
         return ret;
@@ -1477,10 +1468,10 @@ static int test_wait_proc_timeout(void)
 
         TEST_SUCCESS();
 
-        return 0;
+        return TEST_RC_SUCCESS;
  fail:
         REG_TEST_FAIL();
-        return -1;
+        return TEST_RC_FAIL;
 }
 
 static void * test_proc(void * o)
@@ -1527,10 +1518,10 @@ static int test_wait_proc_success(void)
 
         TEST_SUCCESS();
 
-        return 0;
+        return TEST_RC_SUCCESS;
  fail:
         REG_TEST_FAIL();
-        return -1;
+        return TEST_RC_FAIL;
 }
 
 static int test_wait_proc(void)
@@ -1538,7 +1529,6 @@ static int test_wait_proc(void)
         int ret = 0;
 
         ret |= test_wait_proc_timeout();
-
         ret |= test_wait_proc_success();
 
         return ret;
@@ -1554,29 +1544,17 @@ int reg_test(int     argc,
         (void) argv;
 
         ret |= test_reg_init();
-
         ret |= test_reg_flow();
-
         ret |= test_reg_ipcp();
-
         ret |= test_reg_name();
-
         ret |= test_reg_proc();
-
         ret |= test_reg_prog();
-
         ret |= test_reg_spawned();
-
         ret |= test_bind_proc();
-
         ret |= test_bind_prog();
-
         ret |= test_inherit_prog();
-
         ret |= test_wait_accepting();
-
         ret |= test_wait_ipcp_boot();
-
         ret |= test_wait_proc();
 
         return ret;