Merged in dstaesse/ouroboros/be-cacep (pull request #393)

lib: Split authentication from CACEP

11 files changed, 101 insertions, 707 deletions

diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index fcea0fb2..03452705 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -10,12 +10,7 @@ protobuf_generate_c(DIF_CONFIG_PROTO_SRCS DIF_CONFIG_PROTO_HDRS
   dif_config.proto)
 protobuf_generate_c(CDAP_PROTO_SRCS CDAP_PROTO_HDRS cdap.proto)
 protobuf_generate_c(RO_PROTO_SRCS RO_PROTO_HDRS ro.proto)
-protobuf_generate_c(CACEP_PROTO_PROTO_SRCS CACEP_CDAP_PROTO_HDRS
-  pol/cacep_proto.proto)
-protobuf_generate_c(CACEP_ANONYMOUS_AUTH_PROTO_SRCS
-  CACEP_ANONYMOUS_AUTH_PROTO_HDRS pol/cacep_anonymous_auth.proto)
-protobuf_generate_c(CACEP_SIMPLE_AUTH_PROTO_SRCS CACEP_SIMPLE_AUTH_PROTO_HDRS
-  pol/cacep_simple_auth.proto)
+protobuf_generate_c(CACEP_PROTO_SRCS CACEP_PROTO_HDRS cacep.proto)
 
 if(NOT APPLE)
   find_library(LIBRT_LIBRARIES rt)
@@ -54,16 +49,11 @@ set(SOURCE_FILES
   sockets.c
   time_utils.c
   utils.c
-  # Add policies last
-  pol/cacep_proto.c
-  pol/cacep_anonymous_auth.c
-  pol/cacep_simple_auth.c
   )
 
 add_library(ouroboros SHARED ${SOURCE_FILES} ${IRM_PROTO_SRCS}
   ${IPCP_PROTO_SRCS} ${DIF_CONFIG_PROTO_SRCS} ${CDAP_PROTO_SRCS}
-  ${CACEP_PROTO_PROTO_SRCS} ${CACEP_ANONYMOUS_AUTH_PROTO_SRCS}
-  ${CACEP_SIMPLE_AUTH_PROTO_SRCS} ${RO_PROTO_SRCS})
+  ${CACEP_PROTO_SRCS} ${RO_PROTO_SRCS})
 
 target_link_libraries(ouroboros ${LIBRT_LIBRARIES}
   ${LIBPTHREAD_LIBRARIES} ${PROTOBUF_C_LIBRARY})
diff --git a/src/lib/cacep.c b/src/lib/cacep.c
index 89bd05e7..badeccc0 100644
--- a/src/lib/cacep.c
+++ b/src/lib/cacep.c
@@ -1,9 +1,10 @@
 /*
  * Ouroboros - Copyright (C) 2016 - 2017
  *
- * The Common Application Connection Establishment Phase
+ * The Common Application Connection Establishment Protocol
  *
- *    Sander Vrijders <sander.vrijders@intec.ugent.be>
+ *    Dimitri Staessens <dimitri.staessens@ugent.be>
+ *    Sander Vrijders   <sander.vrijders@ugent.be>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -20,91 +21,118 @@
  * 02110-1301 USA
  */
 
-#define OUROBOROS_PREFIX "cacep"
-
 #include <ouroboros/config.h>
 #include <ouroboros/cacep.h>
 #include <ouroboros/dev.h>
 #include <ouroboros/errno.h>
-#include <ouroboros/logs.h>
-
-#include "pol/cacep_anonymous_auth.h"
-#include "pol/cacep_simple_auth.h"
 
 #include <stdlib.h>
 #include <string.h>
 
-#define BUF_SIZE 2048
+#include "cacep.pb-c.h"
+typedef CacepMsg cacep_msg_t;
 
-int conn_info_init(struct conn_info * info)
+#define BUF_SIZE 64
+
+int read_msg(int                fd,
+             struct conn_info * info)
 {
-        if (info == NULL)
-                return -EINVAL;
+        uint8_t                      buf[BUF_SIZE];
+        cacep_msg_t *                msg;
+        ssize_t                      len;
+
+        len = flow_read(fd, buf, BUF_SIZE);
+        if (len < 0)
+                return -1;
+
+        msg = cacep_msg__unpack(NULL, len, buf);
+        if (msg == NULL)
+                return -1;
+
+        strcpy(info->protocol, msg->protocol);
+
+        info->pref_version = msg->pref_version;
+        info->pref_syntax  = msg->pref_syntax;
 
-        info->proto.protocol = NULL;
-        info->name = NULL;
+        cacep_msg__free_unpacked(msg, NULL);
 
         return 0;
 }
 
-void conn_info_fini(struct conn_info * info)
+static int send_msg(int                      fd,
+                    const struct conn_info * info)
 {
-        if (info == NULL)
-                return;
+        cacep_msg_t msg = CACEP_MSG__INIT;
+        uint8_t *   data = NULL;
+        size_t      len  = 0;
 
-        if (info->proto.protocol != NULL) {
-                free(info->proto.protocol);
-                info->proto.protocol = NULL;
-        }
+        msg.ae_name      = (char *) info->ae_name;
+        msg.protocol     = (char *) info->protocol;
+        msg.pref_version = info->pref_version;
+        msg.pref_syntax  = info->pref_syntax;
+        if (msg.pref_syntax < 0)
+                return -1;
+
+        len = cacep_msg__get_packed_size(&msg);
+        if (len == 0)
+                return -1;
+
+        data = malloc(len);
+        if (data == NULL)
+                return -ENOMEM;
+
+        cacep_msg__pack(&msg, data);
 
-        if (info->name != NULL) {
-                free(info->name);
-                info->name = NULL;
+        if (flow_write(fd, data, len) < 0) {
+                free(data);
+                return -1;
         }
+
+        free(data);
+
+        return 0;
 }
 
-struct conn_info * cacep_auth(int                      fd,
-                              enum pol_cacep           pc,
-                              const struct conn_info * info,
-                              const void *             auth)
+int cacep_connect(int                      fd,
+                  const struct conn_info * in,
+                  struct conn_info *       out)
 {
-        if (info == NULL) {
-                log_err("No info provided.");
-                return NULL;
-        }
+        if (in == NULL || out == NULL)
+                return -EINVAL;
 
-        switch (pc) {
-        case ANONYMOUS_AUTH:
-                return cacep_anonymous_auth(fd, info, auth);
-        case SIMPLE_AUTH:
-                if (info == NULL)
-                        return NULL;
-                return cacep_simple_auth_auth(fd, info, auth);
-        default:
-                log_err("Unsupported CACEP policy.");
-                return NULL;
-        }
+        if (send_msg(fd, in))
+                return -1;
+
+        if (read_msg(fd, out))
+                return -1;
+
+        if (strcmp(in->ae_name, out->ae_name) ||
+            strcmp(in->protocol, out->protocol) ||
+            in->pref_version != out->pref_version ||
+            in->pref_syntax != out->pref_syntax)
+                return -EPROTO;
+
+        return 0;
 }
 
-struct conn_info * cacep_auth_wait(int                      fd,
-                                   enum pol_cacep           pc,
-                                   const struct conn_info * info,
-                                   const void *             auth)
+int cacep_listen(int                      fd,
+                 const struct conn_info * in,
+                 struct conn_info *       out)
 {
-        if (info == NULL) {
-                log_err("No info provided.");
-                return NULL;
-        }
+        if (in == NULL || out == NULL)
+                return -EINVAL;
 
-        switch (pc) {
-        case ANONYMOUS_AUTH:
-                return cacep_anonymous_auth_wait(fd, info, auth);
-        case SIMPLE_AUTH:
-                if (info == NULL)
-                        return NULL;
-                return cacep_simple_auth_auth_wait(fd, info, auth);
-        default:
-                log_err("Unsupported CACEP policy.");
-                return NULL;
-        }
+        if (send_msg(fd, in))
+                return -1;
+
+        if (read_msg(fd, out))
+                return -1;
+
+        if (strcmp(in->ae_name, out->ae_name) ||
+            strcmp(in->protocol, out->protocol) ||
+            in->pref_version != out->pref_version ||
+            in->pref_syntax != out->pref_syntax)
+                return -EPROTO;
+
+        return 0;
 }
diff --git a/src/lib/pol/cacep_simple_auth.proto b/src/lib/cacep.proto
index 1a1e7ea8..3e1291f6 100644
--- a/src/lib/pol/cacep_simple_auth.proto
+++ b/src/lib/cacep.proto
@@ -1,7 +1,7 @@
 /*
  * Ouroboros - Copyright (C) 2016 - 2017
  *
- * Message for no authentication CACEP policy
+ * Message for Connection Information in CACEP
  *
  *    Dimitri Staessens <dimitri.staessens@ugent.be>
  *    Sander Vrijders   <sander.vrijders@ugent.be>
@@ -23,10 +23,11 @@
 
 syntax = "proto2";
 
-import "cacep_proto.proto";
-
-message cacep_simple_auth_msg {
-        required cacep_proto_msg proto = 1;
-        required string name           = 2;
-        required uint64 addr           = 3;
-}
+message cacep_msg {
+        required string ae_name     = 1;
+        required string protocol    = 2;
+        required int32 pref_version = 3;
+        repeated int32 supp_version = 4;
+        required int32 pref_syntax  = 5;
+        repeated int32 supp_syntax  = 6;
+}
\ No newline at end of file
diff --git a/src/lib/pol/cacep_anonymous_auth.c b/src/lib/pol/cacep_anonymous_auth.c
deleted file mode 100644
index 44c7bd17..00000000
--- a/src/lib/pol/cacep_anonymous_auth.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Ouroboros - Copyright (C) 2016 - 2017
- *
- * Anonymous policy for CACEP
- *
- *    Dimitri Staessens <dimitri.staessens@ugent.be>
- *    Sander Vrijders   <sander.vrijders@ugent.be>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#include <ouroboros/config.h>
-#include <ouroboros/cacep.h>
-#include <ouroboros/time_utils.h>
-#include <ouroboros/dev.h>
-#include <ouroboros/errno.h>
-
-#include "cacep_proto.h"
-#include "cacep_anonymous_auth.h"
-
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "cacep_anonymous_auth.pb-c.h"
-typedef CacepAnonymousAuthMsg cacep_anonymous_auth_msg_t;
-typedef CacepProtoMsg cacep_proto_msg_t;
-
-#define BUF_SIZE 2048
-#define NAME_LEN 8
-
-/* this policy generates a hex string */
-static struct conn_info * anonymous_info(void)
-{
-        struct conn_info * info;
-        struct timespec t;
-
-        info = malloc(sizeof(*info));
-        if (info == NULL)
-                return NULL;
-
-        conn_info_init(info);
-
-        info->name = malloc(NAME_LEN + 1);
-        if (info->name == NULL) {
-                free(info);
-                return NULL;
-        }
-
-        clock_gettime(CLOCK_REALTIME, &t);
-        srand(t.tv_nsec);
-
-        sprintf(info->name, "%8x",
-                (uint32_t)((rand() % RAND_MAX) & 0xFFFFFFFF));
-
-        info->addr = 0;
-
-        return info;
-}
-
-static struct conn_info * read_msg(int fd)
-{
-        struct conn_info *           tmp;
-        uint8_t                      buf[BUF_SIZE];
-        cacep_anonymous_auth_msg_t * msg;
-        ssize_t                      len;
-
-        len = flow_read(fd, buf, BUF_SIZE);
-        if (len < 0)
-                return NULL;
-
-        msg = cacep_anonymous_auth_msg__unpack(NULL, len, buf);
-        if (msg == NULL)
-                return NULL;
-
-        tmp = anonymous_info();
-        if (tmp == NULL) {
-                cacep_anonymous_auth_msg__free_unpacked(msg, NULL);
-                return NULL;
-        }
-
-        tmp->proto.protocol = strdup(msg->proto->protocol);
-        if (tmp->proto.protocol == NULL) {
-                free(tmp);
-                cacep_anonymous_auth_msg__free_unpacked(msg, NULL);
-                return NULL;
-        }
-
-        tmp->proto.pref_version = msg->proto->pref_version;
-        tmp->proto.pref_syntax  = code_to_syntax(msg->proto->pref_syntax);
-        if (tmp->proto.pref_syntax < 0) {
-                free(tmp->proto.protocol);
-                free(tmp);
-                cacep_anonymous_auth_msg__free_unpacked(msg, NULL);
-                return NULL;
-        }
-
-        cacep_anonymous_auth_msg__free_unpacked(msg, NULL);
-
-        return tmp;
-}
-
-static int send_msg(int                      fd,
-                    const struct conn_info * info)
-{
-        cacep_anonymous_auth_msg_t msg  = CACEP_ANONYMOUS_AUTH_MSG__INIT;
-        cacep_proto_msg_t          cmsg = CACEP_PROTO_MSG__INIT;
-        int                        ret  = 0;
-        uint8_t *                  data = NULL;
-        size_t                     len  = 0;
-
-        cmsg.protocol     = info->proto.protocol;
-        cmsg.pref_version = info->proto.pref_version;
-        cmsg.pref_syntax  = syntax_to_code(info->proto.pref_syntax);
-        if (cmsg.pref_syntax < 0)
-                return -1;
-
-        msg.proto = &cmsg;
-
-        len = cacep_anonymous_auth_msg__get_packed_size(&msg);
-        if (len == 0)
-                return -1;
-
-        data = malloc(len);
-        if (data == NULL)
-                return -ENOMEM;
-
-        cacep_anonymous_auth_msg__pack(&msg, data);
-
-        if (flow_write(fd, data, len) < 0)
-                ret = -1;
-
-        free(data);
-
-        return ret;
-}
-
-struct conn_info * cacep_anonymous_auth(int                      fd,
-                                        const struct conn_info * info,
-                                        const void *             auth)
-{
-        struct conn_info * tmp;
-
-        assert(info);
-
-        (void) auth;
-
-        if (send_msg(fd, info))
-                return NULL;
-
-        tmp = read_msg(fd);
-        if (tmp == NULL)
-                return NULL;
-
-        if (strcmp(info->proto.protocol, tmp->proto.protocol) ||
-            info->proto.pref_version != tmp->proto.pref_version ||
-            info->proto.pref_syntax != tmp->proto.pref_syntax) {
-                conn_info_fini(tmp);
-                free(tmp);
-                return NULL;
-        }
-
-        return tmp;
-}
-
-
-struct conn_info * cacep_anonymous_auth_wait(int                      fd,
-                                             const struct conn_info * info,
-                                             const void *             auth)
-{
-        struct conn_info * tmp;
-
-        assert(info);
-
-        (void) auth;
-
-        tmp = read_msg(fd);
-        if (tmp == NULL)
-                return NULL;
-
-        if (send_msg(fd, info)) {
-                conn_info_fini(tmp);
-                free(tmp);
-                return NULL;
-        }
-
-        if (strcmp(info->proto.protocol, tmp->proto.protocol) ||
-            info->proto.pref_version != tmp->proto.pref_version ||
-            info->proto.pref_syntax != tmp->proto.pref_syntax) {
-                conn_info_fini(tmp);
-                free(tmp);
-                return NULL;
-        }
-
-        return tmp;
-}
diff --git a/src/lib/pol/cacep_anonymous_auth.h b/src/lib/pol/cacep_anonymous_auth.h
deleted file mode 100644
index ca47b1b8..00000000
--- a/src/lib/pol/cacep_anonymous_auth.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Ouroboros - Copyright (C) 2016 - 2017
- *
- * Anonymous policy for CACEP
- *
- *    Dimitri Staessens <dimitri.staessens@ugent.be>
- *    Sander Vrijders   <sander.vrijders@ugent.be>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#ifndef OUROBOROS_LIB_CACEP_ANONYMOUS_AUTH_H
-#define OUROBOROS_LIB_CACEP_ANONYMOUS_AUTH_H
-
-struct conn_info * cacep_anonymous_auth(int                      fd,
-                                        const struct conn_info * info,
-                                        const void *             auth);
-
-struct conn_info * cacep_anonymous_auth_wait(int                      fd,
-                                             const struct conn_info * info,
-                                             const void *             auth);
-
-#endif /* OUROBOROS_LIB_CACEP_ANONYMOUS_AUTH_H */
diff --git a/src/lib/pol/cacep_anonymous_auth.proto b/src/lib/pol/cacep_anonymous_auth.proto
deleted file mode 100644
index 79734e28..00000000
--- a/src/lib/pol/cacep_anonymous_auth.proto
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Ouroboros - Copyright (C) 2016 - 2017
- *
- * Message for no authentication CACEP policy
- *
- *    Dimitri Staessens <dimitri.staessens@ugent.be>
- *    Sander Vrijders   <sander.vrijders@ugent.be>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-syntax = "proto2";
-
-import "cacep_proto.proto";
-
-message cacep_anonymous_auth_msg {
-        required cacep_proto_msg proto = 1;
-}
\ No newline at end of file
diff --git a/src/lib/pol/cacep_proto.c b/src/lib/pol/cacep_proto.c
deleted file mode 100644
index 9990a05a..00000000
--- a/src/lib/pol/cacep_proto.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Ouroboros - Copyright (C) 2016 - 2017
- *
- * CACEP - Read/Write Protocol info
- *
- *    Sander Vrijders   <sander.vrijders@intec.ugent.be>
- *    Dimitri Staessens <dimitri.staessens@intec.ugent.be>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#include "cacep_proto.h"
-
-enum proto_concrete_syntax code_to_syntax(int code)
-{
-        switch(code) {
-        case PROTO_CONCRETE_SYNTAX_CODE__GPB:
-                return PROTO_GPB;
-        case PROTO_CONCRETE_SYNTAX_CODE__ASN_1:
-                return PROTO_ASN_1;
-        case PROTO_CONCRETE_SYNTAX_CODE__FIXED:
-                return PROTO_FIXED;
-        default:
-                return -1;
-        }
-}
-
-int syntax_to_code(enum proto_concrete_syntax stx)
-{
-        switch(stx) {
-        case PROTO_GPB:
-                return PROTO_CONCRETE_SYNTAX_CODE__GPB;
-        case PROTO_ASN_1:
-                return PROTO_CONCRETE_SYNTAX_CODE__ASN_1;
-        case PROTO_FIXED:
-                return PROTO_CONCRETE_SYNTAX_CODE__FIXED;
-        default:
-                return -1;
-        }
-}
diff --git a/src/lib/pol/cacep_proto.h b/src/lib/pol/cacep_proto.h
deleted file mode 100644
index bfb1b247..00000000
--- a/src/lib/pol/cacep_proto.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Ouroboros - Copyright (C) 2016 - 2017
- *
- * CACEP - Convert syntax to msg code and back
- *
- *    Sander Vrijders   <sander.vrijders@intec.ugent.be>
- *    Dimitri Staessens <dimitri.staessens@intec.ugent.be>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#ifndef OUROBOROS_LIB_CACEP_CDAP_H
-#define OUROBOROS_LIB_CACEP_CDAP_H
-
-#include <ouroboros/cacep.h>
-#include <ouroboros/irm_config.h>
-
-#include "cacep_proto.pb-c.h"
-
-enum proto_concrete_syntax code_to_syntax(int code);
-
-int                        syntax_to_code(enum proto_concrete_syntax stx);
-
-#endif /* OUROBOROS_LIB_CACEP_CDAP_H */
diff --git a/src/lib/pol/cacep_proto.proto b/src/lib/pol/cacep_proto.proto
deleted file mode 100644
index f313bfc1..00000000
--- a/src/lib/pol/cacep_proto.proto
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Ouroboros - Copyright (C) 2016 - 2017
- *
- * Message for setting Protocol information in CACEP
- *
- *    Dimitri Staessens <dimitri.staessens@ugent.be>
- *    Sander Vrijders   <sander.vrijders@ugent.be>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-syntax = "proto2";
-
-enum proto_concrete_syntax_code {
-        GPB   = 1;
-        ASN_1 = 2;
-        FIXED = 3;
-}
-
-message cacep_proto_msg {
-        required string protocol                        = 1;
-        required int32 pref_version                     = 2;
-        repeated int32 supp_version                     = 3;
-        required proto_concrete_syntax_code pref_syntax = 4;
-        repeated proto_concrete_syntax_code supp_syntax = 5;
-}
diff --git a/src/lib/pol/cacep_simple_auth.c b/src/lib/pol/cacep_simple_auth.c
deleted file mode 100644
index 69189114..00000000
--- a/src/lib/pol/cacep_simple_auth.c
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Ouroboros - Copyright (C) 2016 - 2017
- *
- * Simple authentication policy for CACEP
- *
- *    Dimitri Staessens <dimitri.staessens@ugent.be>
- *    Sander Vrijders   <sander.vrijders@ugent.be>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#include <ouroboros/config.h>
-#include <ouroboros/cacep.h>
-#include <ouroboros/dev.h>
-#include <ouroboros/errno.h>
-
-#include "cacep_proto.h"
-#include "cacep_simple_auth.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "cacep_simple_auth.pb-c.h"
-typedef CacepSimpleAuthMsg cacep_simple_auth_msg_t;
-typedef CacepProtoMsg cacep_proto_msg_t;
-
-#define BUF_SIZE 2048
-
-static struct conn_info * read_msg(int fd)
-{
-        struct conn_info *       tmp;
-        uint8_t                   buf[BUF_SIZE];
-        cacep_simple_auth_msg_t * msg;
-        ssize_t                   len;
-
-        len = flow_read(fd, buf, BUF_SIZE);
-        if (len < 0)
-                return NULL;
-
-        msg = cacep_simple_auth_msg__unpack(NULL, len, buf);
-        if (msg == NULL)
-                return NULL;
-
-        tmp = malloc(sizeof(*tmp));
-        if (tmp == NULL) {
-                cacep_simple_auth_msg__free_unpacked(msg, NULL);
-                return NULL;
-        }
-
-        conn_info_init(tmp);
-
-        tmp->addr = msg->addr;
-        tmp->name = strdup(msg->name);
-        if (tmp->name == NULL) {
-                free(tmp);
-                cacep_simple_auth_msg__free_unpacked(msg, NULL);
-                return NULL;
-        }
-
-        tmp->proto.protocol = strdup(msg->proto->protocol);
-        if (tmp->proto.protocol == NULL) {
-                conn_info_fini(tmp);
-                free(tmp);
-                cacep_simple_auth_msg__free_unpacked(msg, NULL);
-                return NULL;
-        }
-
-        tmp->proto.pref_version = msg->proto->pref_version;
-        tmp->proto.pref_syntax  = code_to_syntax(msg->proto->pref_syntax);
-        if (tmp->proto.pref_syntax < 0) {
-                conn_info_fini(tmp);
-                free(tmp);
-                cacep_simple_auth_msg__free_unpacked(msg, NULL);
-                return NULL;
-        }
-
-        cacep_simple_auth_msg__free_unpacked(msg, NULL);
-
-        return tmp;
-}
-
-static int send_msg(int                      fd,
-                    const struct conn_info * info)
-{
-        cacep_simple_auth_msg_t msg  = CACEP_SIMPLE_AUTH_MSG__INIT;
-        cacep_proto_msg_t       cmsg = CACEP_PROTO_MSG__INIT;
-        int                     ret  = 0;
-        uint8_t *               data = NULL;
-        size_t                  len  = 0;
-
-        cmsg.protocol     = info->proto.protocol;
-        cmsg.pref_version = info->proto.pref_version;
-        cmsg.pref_syntax  = syntax_to_code(info->proto.pref_syntax);
-        if (cmsg.pref_syntax < 0)
-                return -1;
-
-        msg.proto = &cmsg;
-        msg.name  = info->name;
-        msg.addr  = info->addr;
-
-        len = cacep_simple_auth_msg__get_packed_size(&msg);
-        if (len == 0)
-                return -1;
-
-        data = malloc(len);
-        if (data == NULL)
-                return -ENOMEM;
-
-        cacep_simple_auth_msg__pack(&msg, data);
-
-        if (flow_write(fd, data, len) < 0)
-                ret = -1;
-
-        free(data);
-
-        return ret;
-}
-
-struct conn_info * cacep_simple_auth_auth(int                      fd,
-                                          const struct conn_info * info,
-                                          const void *             auth)
-{
-        struct conn_info * tmp;
-
-        assert(info);
-
-        /* This policy does not need info to authenticate */
-        (void) auth;
-
-        if (send_msg(fd, info))
-                return NULL;
-
-        tmp = read_msg(fd);
-        if (tmp == NULL)
-                return NULL;
-
-        if (strcmp(info->proto.protocol, tmp->proto.protocol) ||
-            info->proto.pref_version != tmp->proto.pref_version ||
-            info->proto.pref_syntax != tmp->proto.pref_syntax) {
-                conn_info_fini(tmp);
-                free(tmp);
-                return NULL;
-        }
-
-        return tmp;
-}
-
-
-struct conn_info * cacep_simple_auth_auth_wait(int                      fd,
-                                               const struct conn_info * info,
-                                               const void *             auth)
-{
-        struct conn_info * tmp;
-
-        assert(info);
-
-        (void) auth;
-
-        tmp = read_msg(fd);
-        if (tmp == NULL)
-                return NULL;
-
-        if (send_msg(fd, info)) {
-                conn_info_fini(tmp);
-                free(tmp);
-                return NULL;
-        }
-
-        if (strcmp(info->proto.protocol, tmp->proto.protocol) ||
-            info->proto.pref_version != tmp->proto.pref_version ||
-            info->proto.pref_syntax != tmp->proto.pref_syntax) {
-                conn_info_fini(tmp);
-                free(tmp);
-                return NULL;
-        }
-
-        return tmp;
-}
diff --git a/src/lib/pol/cacep_simple_auth.h b/src/lib/pol/cacep_simple_auth.h
deleted file mode 100644
index 31398a68..00000000
--- a/src/lib/pol/cacep_simple_auth.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Ouroboros - Copyright (C) 2016 - 2017
- *
- * Simple authentication policy for CACEP
- *
- *    Dimitri Staessens <dimitri.staessens@ugent.be>
- *    Sander Vrijders   <sander.vrijders@ugent.be>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#ifndef OUROBOROS_LIB_CACEP_SIMPLE_AUTH_H
-#define OUROBOROS_LIB_CACEP_SIMPLE_AUTH_H
-
-struct conn_info * cacep_simple_auth_auth(int                      fd,
-                                          const struct conn_info * info,
-                                          const void *             auth);
-
-struct conn_info * cacep_simple_auth_auth_wait(int                      fd,
-                                               const struct conn_info * info,
-                                               const void *             auth);
-
-#endif /* OUROBOROS_LIB_CACEP_SIMPLE_AUTH_H */