diff options
Diffstat (limited to 'src/irmd/oap')
| -rw-r--r-- | src/irmd/oap/cli.c | 7 | ||||
| -rw-r--r-- | src/irmd/oap/hdr.c | 21 |
2 files changed, 15 insertions, 13 deletions
diff --git a/src/irmd/oap/cli.c b/src/irmd/oap/cli.c index 9472e331..b5183ac8 100644 --- a/src/irmd/oap/cli.c +++ b/src/irmd/oap/cli.c @@ -283,13 +283,6 @@ int oap_cli_prepare(void ** ctx, goto fail_kex; } - log_dbg_id(s->id.data, "KEX config: algo=%s, mode=%s, cipher=%s.", - s->kcfg.x.str != NULL ? s->kcfg.x.str : "none", - s->kcfg.x.mode == KEM_MODE_CLIENT_ENCAP ? "client-encap" : - s->kcfg.x.mode == KEM_MODE_SERVER_ENCAP ? "server-encap" : - "none", - s->kcfg.c.str != NULL ? s->kcfg.c.str : "none"); - oap_hdr_init(&s->local_hdr, s->id, s->kex_buf, data, s->kcfg.c.nid); if (do_client_kex_prepare(info->name, s) < 0) { diff --git a/src/irmd/oap/hdr.c b/src/irmd/oap/hdr.c index cdff7ab6..154923e1 100644 --- a/src/irmd/oap/hdr.c +++ b/src/irmd/oap/hdr.c @@ -361,6 +361,7 @@ int oap_hdr_encode(struct oap_hdr * hdr, } #ifdef DEBUG_PROTO_OAP +#define OAP_KEX_IS_KEM(hdr) ((hdr)->kex_flags.role | (hdr)->kex_flags.fmt) static void debug_oap_hdr(const struct oap_hdr * hdr) { assert(hdr); @@ -370,12 +371,20 @@ static void debug_oap_hdr(const struct oap_hdr * hdr) else log_proto(" crt: <none>"); - if (hdr->kex.len > 0) - log_proto(" Key Exchange Data: [%zu bytes] [%s]", - hdr->kex.len, hdr->kex_flags.role ? - "Client encaps" : "Server encaps"); - else - log_proto(" Ephemeral Public Key: <none>"); + if (hdr->kex.len > 0) { + if (OAP_KEX_IS_KEM(hdr)) + log_proto(" Key Exchange Data:" + " [%zu bytes] [%s]", + hdr->kex.len, + hdr->kex_flags.role ? + "Client encaps" : + "Server encaps"); + else + log_proto(" Key Exchange Data:" + " [%zu bytes]", + hdr->kex.len); + } else + log_proto(" Key Exchange Data: <none>"); if (hdr->cipher_str != NULL) log_proto(" Cipher: %s", hdr->cipher_str); |