LMS: use metee cpp wrapper

Use meteepp in code and refactor LMEClient into own class.
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>

Author: ausyskin

MEIClient/AMTHITestProject/AMTHITestProject.cpp

@@ -1,12 +1,11 @@
 /* SPDX-License-Identifier: Apache-2.0 */
 /*
- * Copyright (C) 2013-2023 Intel Corporation
+ * Copyright (C) 2013-2025 Intel Corporation
 */
 // AMTHITestProject.cpp : main project file.
 
 #include"AMTHICommand.h"
 #include"MEIClientException.h"
-#include"HECIException.h"
 
 #include"gtest/gtest.h"
 
@@ -542,7 +541,7 @@ TEST(MCHI, testReadFileExCommand)
  << " 0x" << (uint32_t)theFile.Data[3]
  << std::endl;
 	}
-catch (const Intel::MEI_Client::HeciNoClientException&) {}
+catch (const Intel::MEI_Client::MEIClientExceptionNoClient&) {}
 catch (const Intel::MEI_Client::MCHI_Client::MCHIErrorExceptionNoFile&) {}
 }
 
@@ -554,7 +553,7 @@ TEST(UPID, testGetUPIDFeatureSupportCommand)
  UPID_PLATFORM_ID_FEATURE_SUPPORT_GET_Response support = getSupport.getResponse();
 EXPECT_EQ(support.platformIdSupported & ~(UPID_PLATFORM_ID_UPID_IS_SUPPORTED | UPID_PLATFORM_ID_ATTESTATION_IS_SUPPORTED), 0);
 	}
-catch (const Intel::MEI_Client::HeciNoClientException&) {}
+catch (const Intel::MEI_Client::MEIClientExceptionNoClient&) {}
 }
 
 TEST(UPID, testGetUPIDFeatureOSControlCommand)
@@ -564,7 +563,7 @@ TEST(UPID, testGetUPIDFeatureOSControlCommand)
  GetUPIDFeatureOSControlCommand getOSControl;
  UPID_PLATFORM_ID_FEATURE_OSCONTROL_GET_Response support = getOSControl.getResponse();
 	}
-catch (const Intel::MEI_Client::HeciNoClientException&) {}
+catch (const Intel::MEI_Client::MEIClientExceptionNoClient&) {}
 }
 
 TEST(Manageabiltiy, testMNGIsChangeToAMTEnabledCommand)

MEIClient/CMakeLists.txt

@@ -1,13 +1,12 @@
 # SPDX-License-Identifier: Apache-2.0
-# Copyright (C) 2010-2024 Intel Corporation
+# Copyright (C) 2010-2025 Intel Corporation
 cmake_minimum_required (VERSION3.15)
 
 include (metee.cmake)
 
 add_library (MEIClientSTATIC
 src/MEICommand.cpp
 src/MEIparser.cpp
-src/heci.cpp
 AMTHIClient/Src/AmtAnsiString.cpp
 AMTHIClient/Src/AMTHICommand.cpp
 FWUpdateClient/Src/FWUpdateCommand.cpp
@@ -17,6 +16,7 @@ add_library (MEIClient STATIC
 UPIDClient/Src/UPIDCommand.cpp
 PSRClient/Src/PSRCommand.cpp
 MCHIClient/Src/MCHICommand.cpp
+LMEClient/Src/LMEClient.cpp
 )
 
 set_target_properties (MEIClient PROPERTIES POSITION_INDEPENDENT_CODEON)
@@ -37,6 +37,7 @@ target_include_directories (MEIClient PUBLIC
 "UPIDClient/Include/"
 "PSRClient/Include/"
 "MCHIClient/Include/"
+"LMEClient/Include/"
 )
 if (BUILD_TESTS)
 add_subdirectory ("AMTHITestProject""AMTHITestProject")

MEIClient/Include/HECIException.h

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: Apache-2.0 */
 /*
- * Copyright (C) 2009-2020 Intel Corporation
+ * Copyright (C) 2009-2025 Intel Corporation
 */
 /*++
 
@@ -34,12 +34,20 @@ namespace Intel { namespace MEI_Client {
  : std::system_error(err, cat, what) {}
 virtual~MEIClientException() noexcept {}
 	};
+
 classMEIClientExceptionZeroBuffer : publicMEIClientException
 	{
 public:
 MEIClientExceptionZeroBuffer(const std::string &what, int err = 0) : MEIClientException(what, err) {}
 virtual~MEIClientExceptionZeroBuffer() noexcept {}
 	};
+
+classMEIClientExceptionNoClient : publicMEIClientException
+	{
+public:
+MEIClientExceptionNoClient(const std::string &what, int err = 0) : MEIClientException(what, err) {}
+virtual~MEIClientExceptionNoClient() noexcept {}
+	};
 } /* namespace MEI_Client */ } /* namespace Intel */
 
-#endif//__MEI_CLIENT_EXCEPTION_H
+#endif//__MEI_CLIENT_EXCEPTION_H

MEIClient/Include/MEIClientException.h

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: Apache-2.0 */
 /*
- * Copyright (C) 2010-2023 Intel Corporation
+ * Copyright (C) 2010-2025 Intel Corporation
 */
 /*++
 
@@ -10,7 +10,7 @@
 
 #ifndef __MEI_COMMAND_H__
 #define__MEI_COMMAND_H__
-#include"heci.h"
+#include<meteepp.h>
 #include"MEIClientException.h"
 #include<cstdint>
 #include<memory>
@@ -23,7 +23,7 @@ namespace MEI_Client
 {
 classMEICommandRequest;
 
-HECI* GenerateLMEClient(bool verbose = false);
+intel::security::metee heciClientByGUID(constGUID& guid);
 voidGetHeciDriverVersion(std::string &ver);
 
 classMEICommand

MEIClient/Include/MEICommand.h

@@ -0,0 +1,46 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+/*
+ * Copyright (C) 2021-2026 Intel Corporation
+*/
+/*++
+
+ @file: LMEClient.h
+
+ --*/
+
+#ifndef __LME_CLIENT_H__
+#define__LME_CLIENT_H__
+
+#include<vector>
+#include<memory>
+#include<mutex>
+#include<meteepp.h>
+#include"MEIClientException.h"
+
+namespaceIntel
+{
+namespaceMEI_Client
+	{
+namespaceLME_Client
+ {
+
+classLMEClient {
+public:
+LMEClient() : _heci(nullptr) {}
+
+voidConnect();
+voidDisconnect();
+voidCancel();
+ std::vector<uint8_t> Read();
+size_tWrite(const std::vector<uint8_t> &buffer);
+size_tGetBufferSize() const;
+TEE_DEVICE_HANDLEGetDeviceHandle() const;
+private:
+ std::unique_ptr<intel::security::metee> _heci;
+ std::mutex _sendMessageLock;
+ };
+ } // namespace LME_Client
+	} // namespace MEI_Client
+} // namespace Intel
+
+#endif//__LME_CLIENT_H__

MEIClient/Include/heci.h

@@ -0,0 +1,93 @@
+/* SPDX-License-Identifier: Apache-2.0 */
+/*
+ * Copyright (C) 2021-2026 Intel Corporation
+*/
+/*++
+
+ @file: LMEClient.cpp
+
+ --*/
+
+#include"LMEClient.h"
+#include"MEICommand.h"
+#include<meteepp.h>
+#include"HECI_if.h"
+
+namespaceIntel
+{
+namespaceMEI_Client
+	{
+namespaceLME_Client
+ {
+constuint32_tHECI_IO_TIMEOUT = 5000;
+voidLMEClient::Connect()
+ {
+ _heci.reset(newintel::security::metee(heciClientByGUID(LME_GUID)));
+ }
+
+voidLMEClient::Disconnect()
+ {
+ _heci.reset(nullptr);
+ }
+
+ std::vector<uint8_t> LMEClient::Read()
+ {
+if (_heci == nullptr)
+throwMEIClientException("Not initialized", TEE_INTERNAL_ERROR);
+try
+ {
+return _heci->read(0);
+ }
+catch (const intel::security::metee_exception& e)
+ {
+throwMEIClientException(e.what(), e.code().value());
+ }
+ }
+
+voidLMEClient::Cancel()
+ {
+if (_heci == nullptr)
+throwMEIClientException("Not initialized", TEE_INTERNAL_ERROR);
+try
+ {
+ _heci->cancel_io();
+ }
+catch (const intel::security::metee_exception& e)
+ {
+throwMEIClientException(e.what(), e.code().value());
+ }
+ }
+
+size_tLMEClient::Write(const std::vector<uint8_t> &buffer)
+ {
+if (_heci == nullptr)
+throwMEIClientException("Not initialized", TEE_INTERNAL_ERROR);
+
+ std::lock_guard<std::mutex> lock(_sendMessageLock);
+
+try
+ {
+return _heci->write(buffer, HECI_IO_TIMEOUT);
+ }
+catch (const intel::security::metee_exception& e)
+ {
+throwMEIClientException(e.what(), e.code().value());
+ }
+ }
+
+size_tLMEClient::GetBufferSize() const
+ {
+if (_heci == nullptr)
+throwMEIClientException("Not initialized", TEE_INTERNAL_ERROR);
+return _heci->max_msg_len();
+ }
+
+TEE_DEVICE_HANDLELMEClient::GetDeviceHandle() const
+ {
+if (_heci == nullptr)
+throwMEIClientException("Not initialized", TEE_INTERNAL_ERROR);
+return _heci->device_handle();
+ }
+ } // namespace LME_Client
+	} // namespace MEI_Client
+} // namespace Intel

MEIClient/LMEClient/Include/LMEClient.h

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
-# Copyright (C) 2019-2024 Intel Corporation
+# Copyright (C) 2019-2025 Intel Corporation
 #
 # Inspired by GTest example
 cmake_minimum_required (VERSION3.15)
@@ -9,7 +9,7 @@ project (metee-download NONE)
 include (ExternalProject)
 ExternalProject_Add (metee
 GIT_REPOSITORY https://github.com/intel/metee.git
-GIT_TAG 6.0.2
+GIT_TAG 6.1.0
 SOURCE_DIR"${CMAKE_CURRENT_BINARY_DIR}/metee"
 BINARY_DIR"${CMAKE_CURRENT_BINARY_DIR}/metee-build"
 CONFIGURE_COMMAND""