From 8b66c7ad8d5919ecbdec3c7aad771497726eee9f Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 9 Jan 2020 12:01:46 +0100 Subject: [PATCH] Parameterize EAP method author ID Signed-off-by: Simon Rozman --- EAPMethods/MSIBuild/Makefile | Bin 34464 -> 34770 bytes EAPMethods/src/Main.cpp | 8 ++++---- EAPMethods/src/Main_UI.cpp | 10 +++++----- Makefile | Bin 40302 -> 40302 bytes MakefileEAPMethod.mak | Bin 5394 -> 5666 bytes include/MSIBuildCfg.mak | Bin 13834 -> 13888 bytes include/Version.h | 5 +++++ lib/EAPBase/src/Module.cpp | 2 +- 8 files changed, 15 insertions(+), 10 deletions(-) diff --git a/EAPMethods/MSIBuild/Makefile b/EAPMethods/MSIBuild/Makefile index 91dca247d43b01aa782f8a37d8b4f4b8d853b195..b06ecb8f0e34ff72698fa5f7ba59ea9cfc9497b4 100644 GIT binary patch delta 506 zcmZ3`%XF!qX~UIDT@?lm23H10h5!a%ARWTs!Qju}!VnJ>35D{4fILs2m?i_~)})iBVQy_9Ng5`{H;Yc@%az;gRqsKP#?7-EDoN4+v`Kby zU!&aQSmUQU}J;w=1GlyNGgE_h;CMBRzVY*tkBFcd0(^K T)_;ruCH6C! diff --git a/EAPMethods/src/Main.cpp b/EAPMethods/src/Main.cpp index 4e28968..b062a2d 100644 --- a/EAPMethods/src/Main.cpp +++ b/EAPMethods/src/Main.cpp @@ -651,7 +651,7 @@ DWORD WINAPI EapPeerGetMethodProperties( *ppEapError = NULL; // Parameter check - if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != 67532) + if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != EAPMETHOD_AUTHOR_ID) return dwResult = ERROR_NOT_SUPPORTED; if (!pConnectionData && dwConnectionDataSize || !pUserData && dwUserDataSize || !pMethodPropertyArray) return dwResult = ERROR_INVALID_PARAMETER; @@ -699,7 +699,7 @@ DWORD WINAPI EapPeerCredentialsXml2Blob( *ppEapError = NULL; // Parameter check - if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != 67532) + if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != EAPMETHOD_AUTHOR_ID) return dwResult = ERROR_NOT_SUPPORTED; if (!pCredentialsDoc || !pConnectionData && dwConnectionDataSize || !ppCredentialsOut || !pdwCredentialsOutSize) return dwResult = ERROR_INVALID_PARAMETER; @@ -751,7 +751,7 @@ DWORD WINAPI EapPeerQueryCredentialInputFields( *ppEapError = NULL; // Parameter check - if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != 67532) + if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != EAPMETHOD_AUTHOR_ID) return dwResult = ERROR_NOT_SUPPORTED; if (!pConnectionData && dwConnectionDataSize || !pEapConfigInputFieldsArray) return dwResult = ERROR_INVALID_PARAMETER; @@ -797,7 +797,7 @@ DWORD WINAPI EapPeerQueryUserBlobFromCredentialInputFields( *ppEapError = NULL; // Parameter check - if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != 67532) + if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != EAPMETHOD_AUTHOR_ID) return dwResult = ERROR_NOT_SUPPORTED; if (!pConnectionData && dwConnectionDataSize || !pEapConfigInputFieldArray || !pdwUsersBlobSize || !ppUserBlob) return dwResult = ERROR_INVALID_PARAMETER; diff --git a/EAPMethods/src/Main_UI.cpp b/EAPMethods/src/Main_UI.cpp index dc22130..cfcaee5 100644 --- a/EAPMethods/src/Main_UI.cpp +++ b/EAPMethods/src/Main_UI.cpp @@ -130,7 +130,7 @@ DWORD WINAPI EapPeerConfigXml2Blob( *ppEapError = NULL; // Parameter check - if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != 67532) + if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != EAPMETHOD_AUTHOR_ID) return dwResult = ERROR_NOT_SUPPORTED; if (!pConfigDoc || !pConnectionDataOut || !pdwConnectionDataOutSize) return dwResult = ERROR_INVALID_PARAMETER; @@ -185,7 +185,7 @@ DWORD WINAPI EapPeerConfigBlob2Xml( *ppEapError = NULL; // Parameter check - if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != 67532) + if (eapMethodType.eapType.type != EAPMETHOD_TYPE || eapMethodType.dwAuthorId != EAPMETHOD_AUTHOR_ID) return dwResult = ERROR_NOT_SUPPORTED; if (!pConnectionData && dwConnectionDataSize || !ppConfigDoc) return dwResult = ERROR_INVALID_PARAMETER; @@ -265,7 +265,7 @@ DWORD WINAPI EapPeerInvokeConfigUI( // Parameter check if (!pEapType || !pConnectionDataIn && dwConnectionDataInSize || !pdwConnectionDataOutSize || !ppConnectionDataOut) return dwResult = ERROR_INVALID_PARAMETER; - if (pEapType->eapType.type != EAPMETHOD_TYPE || pEapType->dwAuthorId != 67532) + if (pEapType->eapType.type != EAPMETHOD_TYPE || pEapType->dwAuthorId != EAPMETHOD_AUTHOR_ID) return dwResult = ERROR_NOT_SUPPORTED; try { @@ -319,7 +319,7 @@ DWORD WINAPI EapPeerInvokeIdentityUI( // Parameter check if (!pEapType || !pConnectionData && dwConnectionDataSize || !pUserData && dwUserDataSize || !pdwUserDataOutSize || !ppUserDataOut || !ppwszIdentity) return dwResult = ERROR_INVALID_PARAMETER; - if (pEapType->eapType.type != EAPMETHOD_TYPE || pEapType->dwAuthorId != 67532) + if (pEapType->eapType.type != EAPMETHOD_TYPE || pEapType->dwAuthorId != EAPMETHOD_AUTHOR_ID) return dwResult = ERROR_NOT_SUPPORTED; try { @@ -367,7 +367,7 @@ DWORD WINAPI EapPeerInvokeInteractiveUI( // Parameter check if (!pEapType || !pUIContextData && dwUIContextDataSize || !pdwDataFromInteractiveUISize || !ppDataFromInteractiveUI) return dwResult = ERROR_INVALID_PARAMETER; - if (pEapType->eapType.type != EAPMETHOD_TYPE || pEapType->dwAuthorId != 67532) + if (pEapType->eapType.type != EAPMETHOD_TYPE || pEapType->dwAuthorId != EAPMETHOD_AUTHOR_ID) return dwResult = ERROR_NOT_SUPPORTED; try { diff --git a/Makefile b/Makefile index d47087a2c7e1f7e4ed5a36b6bf35670482aafa1b..932ebd0fd5365ad66975036cabc545bfde9abd06 100644 GIT binary patch delta 150 zcmaF2i|O4irVR;&+A0hh46Y203;_(jKstoMgTbG{g&`g&5(?!70ePN4G0n+_QR45kdm3`Ua;qtqu0SQl(6+Q*0?8ZlYHQ*5$;f!<^T_h*|6 IO8=44w=w44RW0IW0H;W3OVwrC@U-=VqLe ulM4l`H&<|1;8S3`*^IXgw*rv;@A&Z8Unqdre%H-KLV5U%H=Zmb@(lpd7eNqTLv=*a|TleV+JDz TUIs1(#mO6mlsEUW*XRKNCHM{( delta 16 YcmX?*)0ML!i+%Dj6~4{u*eB@$06@tG_W%F@ diff --git a/include/Version.h b/include/Version.h index a350cc3..e36938a 100644 --- a/include/Version.h +++ b/include/Version.h @@ -75,3 +75,8 @@ // developing it, make it easily customizable. // #define PRODUCT_NAME_STR "GÉANTLink" + +// +// EAPHost author ID +// +#define EAPMETHOD_AUTHOR_ID 67532 diff --git a/lib/EAPBase/src/Module.cpp b/lib/EAPBase/src/Module.cpp index 99c9824..fc22e62 100644 --- a/lib/EAPBase/src/Module.cpp +++ b/lib/EAPBase/src/Module.cpp @@ -63,7 +63,7 @@ EAP_ERROR* eap::module::make_error(_In_ DWORD dwErrorCode, _In_opt_z_ LPCWSTR ps pError->type.eapType.type = (BYTE)m_eap_method; pError->type.eapType.dwVendorId = 0; pError->type.eapType.dwVendorType = 0; - pError->type.dwAuthorId = 67532; + pError->type.dwAuthorId = EAPMETHOD_AUTHOR_ID; pError->dwReasonCode = dwReasonCode; pError->rootCauseGuid = pRootCauseGuid != NULL ? *pRootCauseGuid : GUID_NULL; pError->repairGuid = pRepairGuid != NULL ? *pRepairGuid : GUID_NULL;