fixed:build failed

Author: xengine-qyt

VSCopy_Arm64.bat

@@ -2,9 +2,11 @@ copy /y "%XEngine_Arm64%\XEngine_BaseLib\XEngine_BaseLib.dll" "./"
 copy /y "%XEngine_Arm64%\XEngine_BaseLib\XEngine_Algorithm.dll" "./"
 copy /y "%XEngine_Arm64%\XEngine_BaseLib\XEngine_BaseSafe.dll" "./"
 copy /y "%XEngine_Arm64%\XEngine_Core\XEngine_Core.dll" "./"
+copy /y "%XEngine_Arm64%\XEngine_Core\XEngine_Cryption.dll" "./"
 copy /y "%XEngine_Arm64%\XEngine_Core\XEngine_ManagePool.dll" "./"
 copy /y "%XEngine_Arm64%\XEngine_SystemSdk\XEngine_SystemApi.dll" "./"
 copy /y "%XEngine_Arm64%\XEngine_SystemSdk\XEngine_SystemConfig.dll" "./"
 copy /y "%XEngine_Arm64%\XEngine_Client\XClient_APIHelp.dll" "./"
 copy /y "%XEngine_Arm64%\XEngine_Client\XClient_Socket.dll" "./"
-copy /y "%XEngine_Arm64%\XEngine_NetHelp\NetHelp_XSocket.dll" "./"
+copy /y "%XEngine_Arm64%\XEngine_NetHelp\NetHelp_XSocket.dll" "./"
+copy /y "%XEngine_Arm64%\XEngine_RfcComponents\RfcComponents_HttpProtocol.dll" "./"

VSCopy_x64.bat

@@ -2,9 +2,11 @@ copy /y "%XEngine_Lib64%\XEngine_BaseLib\XEngine_BaseLib.dll" "./"
 copy /y "%XEngine_Lib64%\XEngine_BaseLib\XEngine_Algorithm.dll" "./"
 copy /y "%XEngine_Lib64%\XEngine_BaseLib\XEngine_BaseSafe.dll" "./"
 copy /y "%XEngine_Lib64%\XEngine_Core\XEngine_Core.dll" "./"
+copy /y "%XEngine_Lib64%\XEngine_Core\XEngine_Cryption.dll" "./"
 copy /y "%XEngine_Lib64%\XEngine_Core\XEngine_ManagePool.dll" "./"
 copy /y "%XEngine_Lib64%\XEngine_SystemSdk\XEngine_SystemApi.dll" "./"
 copy /y "%XEngine_Lib64%\XEngine_SystemSdk\XEngine_SystemConfig.dll" "./"
 copy /y "%XEngine_Lib64%\XEngine_Client\XClient_APIHelp.dll" "./"
 copy /y "%XEngine_Lib64%\XEngine_Client\XClient_Socket.dll" "./"
-copy /y "%XEngine_Lib64%\XEngine_NetHelp\NetHelp_XSocket.dll" "./"
+copy /y "%XEngine_Lib64%\XEngine_NetHelp\NetHelp_XSocket.dll" "./"
+copy /y "%XEngine_Lib64%\XEngine_RfcComponents\RfcComponents_HttpProtocol.dll" "./"

VSCopy_x86.bat

@@ -2,9 +2,11 @@ copy /y "%XEngine_Lib32%\XEngine_BaseLib\XEngine_BaseLib.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_BaseLib\XEngine_Algorithm.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_BaseLib\XEngine_BaseSafe.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_Core\XEngine_Core.dll" "./"
+copy /y "%XEngine_Lib32%\XEngine_Core\XEngine_Cryption.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_Core\XEngine_ManagePool.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_SystemSdk\XEngine_SystemApi.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_SystemSdk\XEngine_SystemConfig.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_Client\XClient_APIHelp.dll" "./"
 copy /y "%XEngine_Lib32%\XEngine_Client\XClient_Socket.dll" "./"
-copy /y "%XEngine_Lib32%\XEngine_NetHelp\NetHelp_XSocket.dll" "./"
+copy /y "%XEngine_Lib32%\XEngine_NetHelp\NetHelp_XSocket.dll" "./"
+copy /y "%XEngine_Lib32%\XEngine_RfcComponents\RfcComponents_HttpProtocol.dll" "./"

XEngine.sln

@@ -60,6 +60,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AIApi_APPExample", "XEngine
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XEngine_Verification", "XEngine_Module\XEngine_Verification\XEngine_Verification.vcxproj", "{A8E43EC0-698A-4807-8A61-B2BE5FAB7256}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Verification_APPExample", "XEngine_Example\Verification_APPExample\Verification_APPExample.vcxproj", "{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -250,6 +252,18 @@ Global
 		{A8E43EC0-698A-4807-8A61-B2BE5FAB7256}.Release|x64.Build.0 = Release|x64
 		{A8E43EC0-698A-4807-8A61-B2BE5FAB7256}.Release|x86.ActiveCfg = Release|Win32
 		{A8E43EC0-698A-4807-8A61-B2BE5FAB7256}.Release|x86.Build.0 = Release|Win32
+		{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5}.Debug|ARM64.ActiveCfg = Debug|x64
+		{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5}.Debug|ARM64.Build.0 = Debug|x64
+		{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5}.Debug|x64.ActiveCfg = Debug|x64
+		{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5}.Debug|x64.Build.0 = Debug|x64
+		{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5}.Debug|x86.ActiveCfg = Debug|Win32
+		{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5}.Debug|x86.Build.0 = Debug|Win32
+		{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5}.Release|ARM64.ActiveCfg = Release|x64
+		{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5}.Release|ARM64.Build.0 = Release|x64
+		{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5}.Release|x64.ActiveCfg = Release|x64
+		{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5}.Release|x64.Build.0 = Release|x64
+		{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5}.Release|x86.ActiveCfg = Release|Win32
+		{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -270,6 +284,7 @@ Global
 		{DE495AB3-201F-4288-9A3A-41DFA146AD30} = {26417B01-459E-4287-9524-7B0293BAD18A}
 		{C0792082-058B-4BF1-894F-D4D5D7124022} = {58092034-5B83-4806-B7FE-CCDD7414C4AE}
 		{A8E43EC0-698A-4807-8A61-B2BE5FAB7256} = {26417B01-459E-4287-9524-7B0293BAD18A}
+		{EEFE5A12-A7C8-4C60-BB92-84DCCD0B5EE5} = {58092034-5B83-4806-B7FE-CCDD7414C4AE}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {16D43B4F-E3D4-4036-A44C-5DDD64988164}

XEngine_Module/XEngine_Verification/Makefile

@@ -53,7 +53,7 @@ else ifeq ($(PLATFORM), android)
 	FILEEXT = so
 	LIBFLAG = -shared
 	LOADHDR += -I $(HOME)/XEngine_Android_Arm64
-	LOADSO += -L $(HOME)/XEngine_Android_Arm64/XEngine_Android/XEngine_BaseLib $(HOME)/XEngine_Android_Arm64/XEngine_Android/XEngine_Core $(HOME)/XEngine_Android_Arm64/XEngine_Android/XEngine_RfcComponents
+	LOADSO += -L $(HOME)/XEngine_Android_Arm64/XEngine_Android/XEngine_BaseLib -L $(HOME)/XEngine_Android_Arm64/XEngine_Android/XEngine_Core -L $(HOME)/XEngine_Android_Arm64/XEngine_Android/XEngine_RfcComponents
 	LOADBIN = -Wl,-rpath=./,--disable-new-dtags
 	SDKPATH = $(HOME)/android-ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++
 	CC = $(SDKPATH) -Wall -fPIC -std=c++20 -target aarch64-linux-android30

XEngine_Module/XEngine_Verification/Verification_HTTP/Verification_HTTP.cpp

@@ -232,7 +232,29 @@ bool CVerification_HTTP::Verification_HTTP_DigestServerPacket(XCHAR* ptszMSGBuff
 
 	return true;
 }
-
+/********************************************************************
+函数名称：Verification_HTTP_GetType
+函数功能：获得HTTP验证类型
+ 参数.一：pptszListHdr
+  In/Out：In
+  类型：三级指针
+  可空：N
+  意思：输入HTTP头
+ 参数.二：nHdrCount
+  In/Out：In
+  类型：整数型
+  可空：N
+  意思：输入HTTP头个数
+ 参数.三：pInt_Type
+  In/Out：In
+  类型：整数型指针
+  可空：N
+  意思：输出HTTP验证类型1：BASIC验证 2：摘要验证
+返回值
+  类型：逻辑型
+  意思：是否成功
+备注：
+*********************************************************************/
 bool CVerification_HTTP::Verification_HTTP_GetType(XCHAR** pptszListHdr, int nHdrCount, int* pInt_Type)
 {
 	Verification_IsErrorOccur = false;
@@ -263,8 +285,8 @@ bool CVerification_HTTP::Verification_HTTP_GetType(XCHAR** pptszListHdr, int nHd
 	return true;
 }
 /********************************************************************
-函数名称：AuthHelp_APIHelp_HttpAuth
-函数功能：HTTP验证
+函数名称：Verification_HTTP_Basic
+函数功能：HTTP基本验证
  参数.一：ptszUser
   In/Out：Out
   类型：字符指针
@@ -313,6 +335,31 @@ bool CVerification_HTTP::Verification_HTTP_Basic(XCHAR* ptszUser, XCHAR* ptszPas
 	Verification_HTTP_BasicDecoder(tszAuthStr, ptszUser, ptszPass);
 	return true;
 }
+bool CVerification_HTTP::Verification_HTTP_DigestVer(LPCXSTR lpszUser, LPCXSTR lpszPass, XCHAR** pptszListHdr, int nHdrCount)
+{
+	Verification_IsErrorOccur = false;
+	int nAuthType = 0;
+	int nAuthLen = XPATH_MAX;
+	XCHAR tszAuthStr[XPATH_MAX] = {};
+
+	if (!HttpProtocol_ServerHelp_GetAuthInfo(&pptszListHdr, nHdrCount, tszAuthStr, &nAuthLen, &nAuthType))
+	{
+		Verification_IsErrorOccur = true;
+		Verification_dwErrorCode = HttpProtocol_GetLastError();
+		return false;
+	}
+	//是否是摘要验证
+	if (2 != nAuthType)
+	{
+		Verification_IsErrorOccur = true;
+		Verification_dwErrorCode = ERROR_XENGINE_MODULE_VERIFICATION_HTTP_NOTSUPPORT;
+		return false;
+	}
+	XCHAR tszUser[XPATH_MIN] = {};
+	XCHAR tszPass[XPATH_MIN] = {};
+	
+	return true;
+}
 //////////////////////////////////////////////////////////////////////////
 //                      保护函数
 //////////////////////////////////////////////////////////////////////////
@@ -472,7 +519,7 @@ bool CVerification_HTTP::Verification_HTTP_BasicEncoder(LPCXSTR lpszUser, LPCXST
 	}
 	if (bADD)
 	{
-		_xstprintf(ptszMsgBuffer, _X("WWW-Authenticate: Basic %s"), tszBaseBuffer);
+		_xstprintf(ptszMsgBuffer, _X("Authorization: Basic %s"), tszBaseBuffer);
 	}
 	else
 	{

XEngine_Module/XEngine_Verification/Verification_HTTP/Verification_HTTP.h

@@ -25,6 +25,7 @@ class CVerification_HTTP
 public:
 	bool Verification_HTTP_GetType(XCHAR** pptszListHdr, int nHdrCount, int* pInt_Type);
 	bool Verification_HTTP_Basic(XCHAR* ptszUser, XCHAR* ptszPass, XCHAR** pptszListHdr, int nHdrCount);
+	bool Verification_HTTP_DigestVer(LPCXSTR lpszUser, LPCXSTR lpszPass, XCHAR** pptszListHdr, int nHdrCount);
 protected:
 	bool Verification_HTTP_Digest(XCHAR* ptszResponseStr, LPCXSTR lpszUser, LPCXSTR lpszPass, LPCXSTR lpszMethod, LPCXSTR lpszUrl, LPCXSTR lpszNonce, LPCXSTR lpszCNonce, LPCXSTR lpszNC = _X("00000001"), bool bQOPBody = false, LPCXSTR lpszMSGBody = NULL);
 	bool Verification_HTTP_BasicEncoder(LPCXSTR lpszUser, LPCXSTR lpszPass, XCHAR* ptszMsgBuffer, bool bADD = true);