eliminate message length field in EAP-TNC

diff --git a/src/libcharon/plugins/tnccs_11/tnccs_11.c b/src/libcharon/plugins/tnccs_11/tnccs_11.c
index 3673221e5a13966be05dc6f1c572e42dafdbe904..111cb5f1e2582584bae568d588d438dc76364510 100644 (file)
--- a/src/libcharon/plugins/tnccs_11/tnccs_11.c
+++ b/src/libcharon/plugins/tnccs_11/tnccs_11.c
@@ -457,7 +457,7 @@ METHOD(tls_t, build, status_t,
                DBG1(DBG_TNC, "sending TNCCS Batch (%d bytes) for Connection ID %u",
                                           data.len, this->connection_id);
                DBG3(DBG_TNC, "%.*s", data.len, data.ptr);
-               *msglen = data.len;
+               *msglen = 0;
 
                if (data.len > *buflen)
                {

diff --git a/src/libcharon/plugins/tnccs_20/tnccs_20.c b/src/libcharon/plugins/tnccs_20/tnccs_20.c
index 606fc529b14453d1d225e62aeb78f5820359c62d..66f2f664b81bde1c44c202c66edc0fdd4f2cdae8 100644 (file)
--- a/src/libcharon/plugins/tnccs_20/tnccs_20.c
+++ b/src/libcharon/plugins/tnccs_20/tnccs_20.c
@@ -641,7 +641,7 @@ METHOD(tls_t, build, status_t,
                                                   pb_tnc_batch_type_names, batch_type, data.len,
                                                   this->connection_id);
                        DBG3(DBG_TNC, "%B", &data);
-                       *msglen = data.len;
+                       *msglen = 0;
 
                        if (data.len > *buflen)
                        {

diff --git a/src/libtls/tls_eap.c b/src/libtls/tls_eap.c
index e84da70617fe56fdcd10ad25f6a80271d9b8b80f..59723fdd1c2782d8811a8fa4e40ba3833e669bfc 100644 (file)
--- a/src/libtls/tls_eap.c
+++ b/src/libtls/tls_eap.c
@@ -251,11 +251,15 @@ static status_t build_pkt(private_tls_eap_t *this, chunk_t *out)
                                }
                                kind = "packet";
                        }
-                       else
+                       else if (this->type != EAP_TNC)
                        {
                                this->first_fragment = TRUE;
                                kind = "final fragment";
                        }
+                       else
+                       {
+                               kind = "packet";
+                       }
                        break;
                default:
                        return status;
@@ -448,7 +452,7 @@ tls_eap_t *tls_eap_create(eap_type_t type, tls_t *tls, size_t frag_size,
                },
                .type = type,
                .is_server = tls->is_server(tls),
-               .first_fragment = TRUE,
+               .first_fragment = (type != EAP_TNC),
                .frag_size = frag_size,
                .max_msg_count = max_msg_count,
                .include_length = include_length,