lib: Group sec_config authentication fields

Nest the flat req_auth and cacert members of struct sec_config into a
sub-struct a { req; cacert; }, keeping the authentication settings
together.

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

1 files changed, 5 insertions, 5 deletions

diff --git a/src/irmd/oap/auth.c b/src/irmd/oap/auth.c
index 1e39cae6..29e8b4d6 100644
--- a/src/irmd/oap/auth.c
+++ b/src/irmd/oap/auth.c
@@ -268,7 +268,7 @@ int oap_auth_peer(char *                    name,
         }
 
         if (peer_hdr->crt.len == 0) {
-                if (cfg->req_auth) {
+                if (cfg->a.req) {
                         log_err_id(id, "Peer did not provide a certificate.");
                         goto fail_check;
                 }
@@ -291,16 +291,16 @@ int oap_auth_peer(char *                    name,
 
         log_dbg_id(id, "Got public key from crt.");
 
-        if (cfg->cacert[0] != '\0' &&
-            crypt_load_crt_file(cfg->cacert, &pin) < 0) {
-                log_err_id(id, "Failed to load pinned CA %s.", cfg->cacert);
+        if (cfg->a.cacert[0] != '\0' &&
+            crypt_load_crt_file(cfg->a.cacert, &pin) < 0) {
+                log_err_id(id, "Failed to load pinned CA %s.", cfg->a.cacert);
                 goto fail_crt;
         }
 
         ret = auth_verify_crt_pin(oap_auth.ca_ctx, crt, pin);
         if (ret == -ENOENT) {
                 log_err_id(id, "Peer crt not issued by pinned CA %s.",
-                           cfg->cacert);
+                           cfg->a.cacert);
                 goto fail_pin;
         }