instead of cloning use extract_buf() method

diff --git a/src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.c b/src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.c
index b1f6d1eaa7992c0a542ec153b5c2b112a3f34500..d87e0ccea0d524a22b6748084c2d03c5b56833bf 100644 (file)
--- a/src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.c
+++ b/src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.c
@@ -201,7 +201,7 @@ METHOD(pb_tnc_batch_t, build, void,
        }
        enumerator->destroy(enumerator);
 
-       this->encoding = chunk_clone(writer->get_buf(writer));
+       this->encoding = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libimcv/ietf/ietf_attr_assess_result.c b/src/libimcv/ietf/ietf_attr_assess_result.c
index 1c0d6b0eb503e52bc4c1d366ec96ec7f7f5eadc2..55226e3bb500c1b6a6858869bee284453570bef6 100644 (file)
--- a/src/libimcv/ietf/ietf_attr_assess_result.c
+++ b/src/libimcv/ietf/ietf_attr_assess_result.c
@@ -106,7 +106,7 @@ METHOD(pa_tnc_attr_t, build, void,
 
        writer = bio_writer_create(ASSESS_RESULT_SIZE);
        writer->write_uint32(writer, this->result);
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libimcv/ietf/ietf_attr_attr_request.c b/src/libimcv/ietf/ietf_attr_attr_request.c
index c93c9276e6534df02d2993f92d4976db58e5e7a4..5dc4870301ec51e8e80729d17d86408cefa4c370 100644 (file)
--- a/src/libimcv/ietf/ietf_attr_attr_request.c
+++ b/src/libimcv/ietf/ietf_attr_attr_request.c
@@ -125,7 +125,7 @@ METHOD(pa_tnc_attr_t, build, void,
        }
        enumerator->destroy(enumerator);
 
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libimcv/ietf/ietf_attr_default_pwd_enabled.c b/src/libimcv/ietf/ietf_attr_default_pwd_enabled.c
index 2022f45cf6c9bc1a1f9ea3f4d879afd011c3e4ab..2c6b3d5424ba97348cb2053f25a3d32c52a21437 100644 (file)
--- a/src/libimcv/ietf/ietf_attr_default_pwd_enabled.c
+++ b/src/libimcv/ietf/ietf_attr_default_pwd_enabled.c
@@ -106,7 +106,7 @@ METHOD(pa_tnc_attr_t, build, void,
        writer = bio_writer_create(DEFAULT_PWD_ENABLED_SIZE);
        writer->write_uint32(writer, this->status);
 
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libimcv/ietf/ietf_attr_fwd_enabled.c b/src/libimcv/ietf/ietf_attr_fwd_enabled.c
index 911ee5b891d3be589a00a21ab107581eaa3fe66a..a906b2258ad6f1f728ddbb73131b871ef785fea3 100644 (file)
--- a/src/libimcv/ietf/ietf_attr_fwd_enabled.c
+++ b/src/libimcv/ietf/ietf_attr_fwd_enabled.c
@@ -106,7 +106,7 @@ METHOD(pa_tnc_attr_t, build, void,
        writer = bio_writer_create(FORWARDING_ENABLED_SIZE);
        writer->write_uint32(writer, this->fwd_status);
 
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libimcv/ietf/ietf_attr_installed_packages.c b/src/libimcv/ietf/ietf_attr_installed_packages.c
index 72a3c1344833022bc0f6522a616cde9b2eb4365f..462805e389403d8ef7658569dcad2b9d14e989be 100644 (file)
--- a/src/libimcv/ietf/ietf_attr_installed_packages.c
+++ b/src/libimcv/ietf/ietf_attr_installed_packages.c
@@ -144,7 +144,7 @@ METHOD(pa_tnc_attr_t, build, void,
        }
        enumerator->destroy(enumerator);
 
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libimcv/ietf/ietf_attr_numeric_version.c b/src/libimcv/ietf/ietf_attr_numeric_version.c
index 797205473d811774be62d981f9636a46136c561b..73925645711dc1aa849cfbec98722733418991e2 100644 (file)
--- a/src/libimcv/ietf/ietf_attr_numeric_version.c
+++ b/src/libimcv/ietf/ietf_attr_numeric_version.c
@@ -137,7 +137,7 @@ METHOD(pa_tnc_attr_t, build, void,
        writer->write_uint16(writer, this->service_pack_major);
        writer->write_uint16(writer, this->service_pack_minor);
 
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libimcv/ietf/ietf_attr_op_status.c b/src/libimcv/ietf/ietf_attr_op_status.c
index d9610b29d06deb815b430c36120abd0c694d928e..23530684a8666b64cdaa47dae638c736ccbf7250 100644 (file)
--- a/src/libimcv/ietf/ietf_attr_op_status.c
+++ b/src/libimcv/ietf/ietf_attr_op_status.c
@@ -153,7 +153,7 @@ METHOD(pa_tnc_attr_t, build, void,
        writer->write_uint16(writer, 0x0000);
        writer->write_data  (writer, chunk_create(last_use, 20));
 
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libimcv/ietf/ietf_attr_pa_tnc_error.c b/src/libimcv/ietf/ietf_attr_pa_tnc_error.c
index cc3ec28c5b8e3f5e923c356219c82a54fda31752..5f20f89587bdc074d8d5128ddf7f83193f3e348a 100644 (file)
--- a/src/libimcv/ietf/ietf_attr_pa_tnc_error.c
+++ b/src/libimcv/ietf/ietf_attr_pa_tnc_error.c
@@ -206,7 +206,7 @@ METHOD(pa_tnc_attr_t, build, void,
                                break;
                }
        }
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libimcv/ietf/ietf_attr_port_filter.c b/src/libimcv/ietf/ietf_attr_port_filter.c
index 8b8da3a41a9491a1d7bbb3ff444edaf240778b5f..1d516a51fbb0b3d08adbcad7cb2d0b66752227f4 100644 (file)
--- a/src/libimcv/ietf/ietf_attr_port_filter.c
+++ b/src/libimcv/ietf/ietf_attr_port_filter.c
@@ -130,7 +130,7 @@ METHOD(pa_tnc_attr_t, build, void,
        }
        enumerator->destroy(enumerator);
 
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libimcv/ietf/ietf_attr_product_info.c b/src/libimcv/ietf/ietf_attr_product_info.c
index 115f00130a9e9a72834c0d143aec515c82f496d8..a107c27d302180dd019697bc00ea0f3d23ad920c 100644 (file)
--- a/src/libimcv/ietf/ietf_attr_product_info.c
+++ b/src/libimcv/ietf/ietf_attr_product_info.c
@@ -119,7 +119,7 @@ METHOD(pa_tnc_attr_t, build, void,
        writer->write_uint16(writer, this->product_id);
        writer->write_data  (writer, this->product_name);
 
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libimcv/ietf/ietf_attr_remediation_instr.c b/src/libimcv/ietf/ietf_attr_remediation_instr.c
index d28631ec7af4e647edac4f694073e9937a9d5896..5d85e5d8971b8df8c543118664b84141bb2bfb38 100644 (file)
--- a/src/libimcv/ietf/ietf_attr_remediation_instr.c
+++ b/src/libimcv/ietf/ietf_attr_remediation_instr.c
@@ -154,7 +154,7 @@ METHOD(pa_tnc_attr_t, build, void,
        writer->write_uint32(writer, this->parameters_type.type);
        writer->write_data  (writer, this->parameters);
 
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libimcv/ietf/ietf_attr_string_version.c b/src/libimcv/ietf/ietf_attr_string_version.c
index 8f4129eac63c330ca446de72f47462edd4d81349..68adde6123be828bc909388a05f39ec1ec495be2 100644 (file)
--- a/src/libimcv/ietf/ietf_attr_string_version.c
+++ b/src/libimcv/ietf/ietf_attr_string_version.c
@@ -123,7 +123,7 @@ METHOD(pa_tnc_attr_t, build, void,
        writer->write_data8(writer, this->build);
        writer->write_data8(writer, this->config);
 
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libimcv/ita/ita_attr_get_settings.c b/src/libimcv/ita/ita_attr_get_settings.c
index 8016b761dab1a2221c0b9771dd6e05c9e947df76..0695af314ce13e83c8e15f78b9ebd78952cfa7a4 100644 (file)
--- a/src/libimcv/ita/ita_attr_get_settings.c
+++ b/src/libimcv/ita/ita_attr_get_settings.c
@@ -128,7 +128,7 @@ METHOD(pa_tnc_attr_t, build, void,
        }
        enumerator->destroy(enumerator);
 
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libimcv/ita/ita_attr_settings.c b/src/libimcv/ita/ita_attr_settings.c
index 7941cf69e83ec14956d66843fe1e2334871428cb..9ce253d2800597bde5ff99c6c9a866978b62fc2c 100644 (file)
--- a/src/libimcv/ita/ita_attr_settings.c
+++ b/src/libimcv/ita/ita_attr_settings.c
@@ -157,7 +157,7 @@ METHOD(pa_tnc_attr_t, build, void,
        }
        enumerator->destroy(enumerator);
 
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libimcv/pa_tnc/pa_tnc_msg.c b/src/libimcv/pa_tnc/pa_tnc_msg.c
index d3aceee06a45017374a1f79254b1cb359e30e175..140463b83ddcf7a59135819d316b27994775b6fd 100644 (file)
--- a/src/libimcv/pa_tnc/pa_tnc_msg.c
+++ b/src/libimcv/pa_tnc/pa_tnc_msg.c
@@ -194,7 +194,7 @@ METHOD(pa_tnc_msg_t, build, bool,
        enumerator->destroy(enumerator);
 
        free(this->encoding.ptr);
-       this->encoding = chunk_clone(writer->get_buf(writer));
+       this->encoding = writer->extract_buf(writer);
        writer->destroy(writer);
 
        return TRUE;

diff --git a/src/libpts/pts/pts.c b/src/libpts/pts/pts.c
index 84a9961c8ac4fd9eb931ccba85ffc60b56869a32..f646d67e126611d12d019a7bd70d474dfa3b2cbf 100644 (file)
--- a/src/libpts/pts/pts.c
+++ b/src/libpts/pts/pts.c
@@ -1043,7 +1043,7 @@ METHOD(pts_t, get_quote_info, bool,
        }
 
        /* TPM Quote Info */
-       *out_quote_info = chunk_clone(writer->get_buf(writer));
+       *out_quote_info = writer->extract_buf(writer);
        DBG3(DBG_PTS, "constructed TPM Quote Info: %B", out_quote_info);
 
        writer->destroy(writer);

diff --git a/src/libpts/tcg/tcg_pts_attr_aik.c b/src/libpts/tcg/tcg_pts_attr_aik.c
index d5bbdc9cd2ed68edf8744bf4ab3a4a96046c9b49..17a8db5d6883e94120a9c7bde99fd3e9eb8fbbb1 100644 (file)
--- a/src/libpts/tcg/tcg_pts_attr_aik.c
+++ b/src/libpts/tcg/tcg_pts_attr_aik.c
@@ -123,9 +123,9 @@ METHOD(pa_tnc_attr_t, build, void,
        writer = bio_writer_create(PTS_AIK_SIZE);
        writer->write_uint8(writer, flags);
        writer->write_data (writer, aik_blob);
-       this->value = chunk_clone(writer->get_buf(writer));
-       free(aik_blob.ptr);
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
+       free(aik_blob.ptr);
 }
 
 METHOD(pa_tnc_attr_t, process, status_t,

diff --git a/src/libpts/tcg/tcg_pts_attr_dh_nonce_finish.c b/src/libpts/tcg/tcg_pts_attr_dh_nonce_finish.c
index 4d7281243bc207285d6604b66b3416715a1c5fb2..6119b4973ece0d6b13a12e98c6fe03e62aef6381 100644 (file)
--- a/src/libpts/tcg/tcg_pts_attr_dh_nonce_finish.c
+++ b/src/libpts/tcg/tcg_pts_attr_dh_nonce_finish.c
@@ -128,7 +128,7 @@ METHOD(pa_tnc_attr_t, build, void,
        writer->write_data  (writer, this->initiator_value);
        writer->write_data  (writer, this->initiator_nonce);
 
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libpts/tcg/tcg_pts_attr_dh_nonce_params_req.c b/src/libpts/tcg/tcg_pts_attr_dh_nonce_params_req.c
index 7796dbaabbc2c96a11e6ce20c1543b68bde1d436..7761b977df74fb025ab57e700df5f3a708489c0c 100644 (file)
--- a/src/libpts/tcg/tcg_pts_attr_dh_nonce_params_req.c
+++ b/src/libpts/tcg/tcg_pts_attr_dh_nonce_params_req.c
@@ -117,7 +117,7 @@ METHOD(pa_tnc_attr_t, build, void,
        writer->write_uint8 (writer, this->min_nonce_len);
        writer->write_uint16(writer, this->dh_groups);
 
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libpts/tcg/tcg_pts_attr_dh_nonce_params_resp.c b/src/libpts/tcg/tcg_pts_attr_dh_nonce_params_resp.c
index 1e82e7098de4711898abea9dd7c23e3e6dbf8bb8..eb0d0e533bea20256dd08db3eacc8a5387c20804 100644 (file)
--- a/src/libpts/tcg/tcg_pts_attr_dh_nonce_params_resp.c
+++ b/src/libpts/tcg/tcg_pts_attr_dh_nonce_params_resp.c
@@ -136,7 +136,7 @@ METHOD(pa_tnc_attr_t, build, void,
        writer->write_data  (writer, this->responder_nonce);
        writer->write_data  (writer, this->responder_value);
 
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libpts/tcg/tcg_pts_attr_file_meas.c b/src/libpts/tcg/tcg_pts_attr_file_meas.c
index 1daac70e5cd49eacfe26c8f5a5ffeeb291e2463c..b9095f5be64a4c29b981df3524aab79ac71bd0d1 100644 (file)
--- a/src/libpts/tcg/tcg_pts_attr_file_meas.c
+++ b/src/libpts/tcg/tcg_pts_attr_file_meas.c
@@ -154,7 +154,7 @@ METHOD(pa_tnc_attr_t, build, void,
                writer->write_uint16(writer, 0);
        }
 
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libpts/tcg/tcg_pts_attr_gen_attest_evid.c b/src/libpts/tcg/tcg_pts_attr_gen_attest_evid.c
index 9103e06b2c206f39d46fd9c378844be830a71a93..f263747a3e5ede6b86be8708c8f9d4f5fda01c92 100644 (file)
--- a/src/libpts/tcg/tcg_pts_attr_gen_attest_evid.c
+++ b/src/libpts/tcg/tcg_pts_attr_gen_attest_evid.c
@@ -106,7 +106,7 @@ METHOD(pa_tnc_attr_t, build, void,
        writer = bio_writer_create(PTS_GEN_ATTEST_EVID_SIZE);
        writer->write_uint32 (writer, PTS_GEN_ATTEST_EVID_RESERVED);
 
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libpts/tcg/tcg_pts_attr_get_aik.c b/src/libpts/tcg/tcg_pts_attr_get_aik.c
index 6f35f541943618657330791f1af8024cf9480dd2..cf944d2a9bc5e41705bc4e4637260ede44c6ced7 100644 (file)
--- a/src/libpts/tcg/tcg_pts_attr_get_aik.c
+++ b/src/libpts/tcg/tcg_pts_attr_get_aik.c
@@ -103,7 +103,7 @@ METHOD(pa_tnc_attr_t, build, void,
        writer = bio_writer_create(PTS_GET_AIK_SIZE);
        writer->write_uint32 (writer, PTS_GET_AIK_RESERVED);
 
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libpts/tcg/tcg_pts_attr_get_tpm_version_info.c b/src/libpts/tcg/tcg_pts_attr_get_tpm_version_info.c
index 4dd64e3a7bb6f0789a039a46b16b5cd2e398a3af..647c426edea0fc28e32bcddc86b123b1501293a1 100644 (file)
--- a/src/libpts/tcg/tcg_pts_attr_get_tpm_version_info.c
+++ b/src/libpts/tcg/tcg_pts_attr_get_tpm_version_info.c
@@ -106,7 +106,7 @@ METHOD(pa_tnc_attr_t, build, void,
        writer = bio_writer_create(PTS_GET_TPM_VER_INFO_SIZE);
        writer->write_uint32 (writer, PTS_GET_TPM_VER_INFO_RESERVED);
 
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libpts/tcg/tcg_pts_attr_meas_algo.c b/src/libpts/tcg/tcg_pts_attr_meas_algo.c
index abef45bdd4d40766587cb9e9333526b805bfb9a5..a4dac90707e8fabc32bbdc081e426962e341493e 100644 (file)
--- a/src/libpts/tcg/tcg_pts_attr_meas_algo.c
+++ b/src/libpts/tcg/tcg_pts_attr_meas_algo.c
@@ -109,7 +109,7 @@ METHOD(pa_tnc_attr_t, build, void,
        writer = bio_writer_create(PTS_MEAS_ALGO_SIZE);
        writer->write_uint16(writer, PTS_MEAS_ALGO_RESERVED);
        writer->write_uint16(writer, this->algorithms);
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libpts/tcg/tcg_pts_attr_proto_caps.c b/src/libpts/tcg/tcg_pts_attr_proto_caps.c
index 360883282047d92135855830f524e7ade49b086b..6473ea808c1273569fa557b6d7ea962e0a2f9797 100644 (file)
--- a/src/libpts/tcg/tcg_pts_attr_proto_caps.c
+++ b/src/libpts/tcg/tcg_pts_attr_proto_caps.c
@@ -110,7 +110,7 @@ METHOD(pa_tnc_attr_t, build, void,
        writer->write_uint16(writer, PTS_PROTO_CAPS_RESERVED);
        writer->write_uint16(writer, this->flags);
 
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libpts/tcg/tcg_pts_attr_req_file_meas.c b/src/libpts/tcg/tcg_pts_attr_req_file_meas.c
index 8b4bfe54defd0e1602250ebd128f0ffd8120bd0e..f0bc7cf60181aa647747107d0e18ff65479918b8 100644 (file)
--- a/src/libpts/tcg/tcg_pts_attr_req_file_meas.c
+++ b/src/libpts/tcg/tcg_pts_attr_req_file_meas.c
@@ -143,7 +143,7 @@ METHOD(pa_tnc_attr_t, build, void,
        writer->write_uint16(writer, this->request_id);
        writer->write_uint32(writer, this->delimiter);
        writer->write_data  (writer, pathname);
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libpts/tcg/tcg_pts_attr_req_file_meta.c b/src/libpts/tcg/tcg_pts_attr_req_file_meta.c
index ff5581435db0f13ac10de267e4ce967fece1ee3a..e475cd35b824264358e5a60bb73f58ba40f1b3a2 100644 (file)
--- a/src/libpts/tcg/tcg_pts_attr_req_file_meta.c
+++ b/src/libpts/tcg/tcg_pts_attr_req_file_meta.c
@@ -136,7 +136,7 @@ METHOD(pa_tnc_attr_t, build, void,
        writer->write_uint16(writer, PTS_REQ_FILE_META_RESERVED);
 
        writer->write_data  (writer, pathname);
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libpts/tcg/tcg_pts_attr_req_func_comp_evid.c b/src/libpts/tcg/tcg_pts_attr_req_func_comp_evid.c
index 8bb43aef8815a110b4fdfc4cd7d6e65a71a421ae..5249fa2ad668b9ec34b37c410616e4dcb8128495 100644 (file)
--- a/src/libpts/tcg/tcg_pts_attr_req_func_comp_evid.c
+++ b/src/libpts/tcg/tcg_pts_attr_req_func_comp_evid.c
@@ -183,7 +183,7 @@ METHOD(pa_tnc_attr_t, build, void,
        }
        enumerator->destroy(enumerator);
 
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libpts/tcg/tcg_pts_attr_simple_comp_evid.c b/src/libpts/tcg/tcg_pts_attr_simple_comp_evid.c
index c659443b7f9524fe12ae3854b322c71a4ad86d49..40f380ab496b3a095907d1536da074f0d6b00074 100644 (file)
--- a/src/libpts/tcg/tcg_pts_attr_simple_comp_evid.c
+++ b/src/libpts/tcg/tcg_pts_attr_simple_comp_evid.c
@@ -242,7 +242,7 @@ METHOD(pa_tnc_attr_t, build, void,
 
        writer->write_data(writer, measurement);
 
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libpts/tcg/tcg_pts_attr_simple_evid_final.c b/src/libpts/tcg/tcg_pts_attr_simple_evid_final.c
index 8c76651d6e80c8d98215c555229a48a8017ea57b..baadd943f781721f3547c319e99fcd19eba710be 100644 (file)
--- a/src/libpts/tcg/tcg_pts_attr_simple_evid_final.c
+++ b/src/libpts/tcg/tcg_pts_attr_simple_evid_final.c
@@ -194,7 +194,7 @@ METHOD(pa_tnc_attr_t, build, void,
                writer->write_data (writer, this->evid_sig);
        }
 
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libpts/tcg/tcg_pts_attr_tpm_version_info.c b/src/libpts/tcg/tcg_pts_attr_tpm_version_info.c
index 5143e1676c65fb1caa681fc823c07fcd63e59da6..b776cb66206e4871146080e1811044ff7d516fee 100644 (file)
--- a/src/libpts/tcg/tcg_pts_attr_tpm_version_info.c
+++ b/src/libpts/tcg/tcg_pts_attr_tpm_version_info.c
@@ -110,7 +110,7 @@ METHOD(pa_tnc_attr_t, build, void,
        writer = bio_writer_create(PTS_TPM_VER_INFO_SIZE);
        writer->write_data(writer, this->tpm_version_info);
 
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }
 

diff --git a/src/libpts/tcg/tcg_pts_attr_unix_file_meta.c b/src/libpts/tcg/tcg_pts_attr_unix_file_meta.c
index 56686d8cab0f56c444246a6b2b8f5b2144750cbb..f96371b8b0e3273a0fca0a29d9a1912a35dd44d3 100644 (file)
--- a/src/libpts/tcg/tcg_pts_attr_unix_file_meta.c
+++ b/src/libpts/tcg/tcg_pts_attr_unix_file_meta.c
@@ -166,7 +166,7 @@ METHOD(pa_tnc_attr_t, build, void,
        }
        enumerator->destroy(enumerator);
 
-       this->value = chunk_clone(writer->get_buf(writer));
+       this->value = writer->extract_buf(writer);
        writer->destroy(writer);
 }