From 8a0dfdcb3f4792b20741fd274b6fffc17e899f55 Mon Sep 17 00:00:00 2001 From: Ryan Stecker Date: Wed, 14 Mar 2012 02:17:49 -0500 Subject: [PATCH] Updated EMsg list. Fixed SymmetricDecrypt hook for beta steamclient. --- Resources/Misc/emsg_list_detailed.txt | 233 +++++++++++++------------ Resources/NetHook2/NetHook2/crypto.cpp | 10 +- Resources/NetHook2/NetHook2/crypto.h | 2 +- 3 files changed, 132 insertions(+), 113 deletions(-) diff --git a/Resources/Misc/emsg_list_detailed.txt b/Resources/Misc/emsg_list_detailed.txt index 0118d81b..9655e101 100644 --- a/Resources/Misc/emsg_list_detailed.txt +++ b/Resources/Misc/emsg_list_detailed.txt @@ -1,4 +1,6 @@ k_EMsgRemoteSysID = 128, // flags: 3, server type: -1 + k_EMsgServiceMethod = 146, // flags: 0, server type: -1 + k_EMsgServiceMethodResponse = 147, // flags: 0, server type: -1 k_EMsgClientChatAction = 597, // flags: 2, server type: -1 k_EMsgCSUserContentRequest = 652, // flags: 2, server type: -1 k_EMsgClientLogOn_Deprecated = 701, // flags: 2, server type: -1 @@ -148,10 +150,10 @@ k_EMsgFileXferDataAck = 1204, // flags: 3, server type: -1 k_EMsgChannelEncryptRequest = 1303, // flags: 3, server type: -1 k_EMsgChannelEncryptResponse = 1304, // flags: 3, server type: -1 - k_EMsgClientDPCheckSpecialSurvey = 1620, // flags: 2, server type: 17 - k_EMsgClientDPCheckSpecialSurveyResponse = 1621, // flags: 2, server type: 17 - k_EMsgClientDPSendSpecialSurveyResponse = 1622, // flags: 2, server type: 17 - k_EMsgClientDPSendSpecialSurveyResponseReply = 1623, // flags: 2, server type: 17 + k_EMsgClientDPCheckSpecialSurvey = 1620, // flags: 6, server type: 17 + k_EMsgClientDPCheckSpecialSurveyResponse = 1621, // flags: 6, server type: 17 + k_EMsgClientDPSendSpecialSurveyResponse = 1622, // flags: 6, server type: 17 + k_EMsgClientDPSendSpecialSurveyResponseReply = 1623, // flags: 6, server type: 17 k_EMsgClientChatRoomInfo = 4026, // flags: 2, server type: -1 k_EMsgAMGameServerUpdate = 4331, // flags: 2, server type: -1 k_EMsgAMGameServerRemove = 4332, // flags: 2, server type: -1 @@ -159,8 +161,8 @@ k_EMsgClientUFSUploadFileResponse = 5203, // flags: 2, server type: -1 k_EMsgClientUFSUploadFileChunk = 5204, // flags: 2, server type: -1 k_EMsgClientUFSUploadFileFinished = 5205, // flags: 2, server type: -1 - k_EMsgClientUFSGetFileListForApp = 5206, // flags: 2, server type: 21 - k_EMsgClientUFSGetFileListForAppResponse = 5207, // flags: 2, server type: 21 + k_EMsgClientUFSGetFileListForApp = 5206, // flags: 6, server type: 21 + k_EMsgClientUFSGetFileListForAppResponse = 5207, // flags: 6, server type: 21 k_EMsgClientUFSDownloadRequest = 5210, // flags: 2, server type: -1 k_EMsgClientUFSDownloadResponse = 5211, // flags: 2, server type: -1 k_EMsgClientUFSDownloadChunk = 5212, // flags: 2, server type: -1 @@ -169,12 +171,12 @@ k_EMsgClientUFSTransferHeartbeat = 5216, // flags: 2, server type: -1 k_EMsgClientUFSDeleteFileRequest = 5219, // flags: 2, server type: -1 k_EMsgClientUFSDeleteFileResponse = 5220, // flags: 2, server type: -1 - k_EMsgClientUFSGetUGCDetails = 5226, // flags: 2, server type: 21 - k_EMsgClientUFSGetUGCDetailsResponse = 5227, // flags: 2, server type: 21 - k_EMsgClientUFSGetSingleFileInfo = 5230, // flags: 2, server type: 21 - k_EMsgClientUFSGetSingleFileInfoResponse = 5231, // flags: 2, server type: 21 - k_EMsgClientUFSShareFile = 5232, // flags: 2, server type: 21 - k_EMsgClientUFSShareFileResponse = 5233, // flags: 2, server type: 21 + k_EMsgClientUFSGetUGCDetails = 5226, // flags: 6, server type: 21 + k_EMsgClientUFSGetUGCDetailsResponse = 5227, // flags: 6, server type: 21 + k_EMsgClientUFSGetSingleFileInfo = 5230, // flags: 6, server type: 21 + k_EMsgClientUFSGetSingleFileInfoResponse = 5231, // flags: 6, server type: 21 + k_EMsgClientUFSShareFile = 5232, // flags: 6, server type: 21 + k_EMsgClientUFSShareFileResponse = 5233, // flags: 6, server type: 21 k_EMsgClientRequestForgottenPasswordEmail = 5401, // flags: 2, server type: -1 k_EMsgClientRequestForgottenPasswordEmailResponse = 5402, // flags: 2, server type: -1 k_EMsgClientCreateAccountResponse = 5403, // flags: 2, server type: -1 @@ -188,22 +190,22 @@ k_EMsgClientUpdateUserGameInfo = 5411, // flags: 2, server type: -1 k_EMsgClientFileToDownload = 5412, // flags: 2, server type: -1 k_EMsgClientFileToDownloadResponse = 5413, // flags: 2, server type: -1 - k_EMsgClientLBSSetScore = 5414, // flags: 2, server type: 34 - k_EMsgClientLBSSetScoreResponse = 5415, // flags: 2, server type: 34 - k_EMsgClientLBSFindOrCreateLB = 5416, // flags: 2, server type: 34 - k_EMsgClientLBSFindOrCreateLBResponse = 5417, // flags: 2, server type: 34 - k_EMsgClientLBSGetLBEntries = 5418, // flags: 2, server type: 34 - k_EMsgClientLBSGetLBEntriesResponse = 5419, // flags: 2, server type: 34 + k_EMsgClientLBSSetScore = 5414, // flags: 6, server type: 34 + k_EMsgClientLBSSetScoreResponse = 5415, // flags: 6, server type: 34 + k_EMsgClientLBSFindOrCreateLB = 5416, // flags: 6, server type: 34 + k_EMsgClientLBSFindOrCreateLBResponse = 5417, // flags: 6, server type: 34 + k_EMsgClientLBSGetLBEntries = 5418, // flags: 6, server type: 34 + k_EMsgClientLBSGetLBEntriesResponse = 5419, // flags: 6, server type: 34 k_EMsgClientMarketingMessageUpdate = 5420, // flags: 2, server type: -1 k_EMsgClientChatDeclined = 5426, // flags: 2, server type: -1 k_EMsgClientFriendMsgIncoming = 5427, // flags: 2, server type: -1 k_EMsgClientAuthList_Deprecated = 5428, // flags: 2, server type: -1 k_EMsgClientTicketAuthComplete = 5429, // flags: 2, server type: -1 k_EMsgClientIsLimitedAccount = 5430, // flags: 2, server type: -1 - k_EMsgClientAuthList = 5432, // flags: 2, server type: 58 + k_EMsgClientAuthList = 5432, // flags: 6, server type: 58 k_EMsgClientStat = 5433, // flags: 2, server type: -1 - k_EMsgClientP2PConnectionInfo = 5434, // flags: 2, server type: 41 - k_EMsgClientP2PConnectionFailInfo = 5435, // flags: 2, server type: 41 + k_EMsgClientP2PConnectionInfo = 5434, // flags: 6, server type: 41 + k_EMsgClientP2PConnectionFailInfo = 5435, // flags: 6, server type: 41 k_EMsgClientGetNumberOfCurrentPlayers = 5436, // flags: 2, server type: -1 k_EMsgClientGetNumberOfCurrentPlayersResponse = 5437, // flags: 2, server type: -1 k_EMsgClientGetDepotDecryptionKey = 5438, // flags: 2, server type: -1 @@ -215,7 +217,7 @@ k_EMsgClientDisableTestLicenseResponse = 5446, // flags: 2, server type: -1 k_EMsgClientRequestValidationMail = 5448, // flags: 2, server type: -1 k_EMsgClientRequestValidationMailResponse = 5449, // flags: 2, server type: -1 - k_EMsgClientToGC = 5452, // flags: 2, server type: -1 + k_EMsgClientToGC = 5452, // flags: 6, server type: 57 k_EMsgClientFromGC = 5453, // flags: 2, server type: -1 k_EMsgClientRequestChangeMail = 5454, // flags: 2, server type: -1 k_EMsgClientRequestChangeMailResponse = 5455, // flags: 2, server type: -1 @@ -246,7 +248,7 @@ k_EMsgClientOGSBeginSessionResponse = 5491, // flags: 2, server type: -1 k_EMsgClientOGSEndSession = 5492, // flags: 2, server type: -1 k_EMsgClientOGSEndSessionResponse = 5493, // flags: 2, server type: -1 - k_EMsgClientOGSWriteRow = 5494, // flags: 2, server type: 39 + k_EMsgClientOGSWriteRow = 5494, // flags: 6, server type: 39 k_EMsgClientDRMTest = 5495, // flags: 2, server type: -1 k_EMsgClientDRMTestResult = 5496, // flags: 2, server type: -1 k_EMsgClientServerUnavailable = 5500, // flags: 2, server type: -1 @@ -263,22 +265,22 @@ k_EMsgClientDeregisterWithServer = 5511, // flags: 2, server type: -1 k_EMsgClientSubscribeToPersonaFeed = 5512, // flags: 2, server type: -1 k_EMsgClientLogon = 5514, // flags: 2, server type: -1 - k_EMsgClientGetClientDetails = 5515, // flags: 2, server type: 41 - k_EMsgClientGetClientDetailsResponse = 5516, // flags: 2, server type: 41 + k_EMsgClientGetClientDetails = 5515, // flags: 6, server type: 41 + k_EMsgClientGetClientDetailsResponse = 5516, // flags: 6, server type: 41 k_EMsgClientReportOverlayDetourFailure = 5517, // flags: 3, server type: -1 - k_EMsgClientGetClientAppList = 5518, // flags: 2, server type: 41 - k_EMsgClientGetClientAppListResponse = 5519, // flags: 2, server type: 41 - k_EMsgClientInstallClientApp = 5520, // flags: 2, server type: 41 - k_EMsgClientInstallClientAppResponse = 5521, // flags: 2, server type: 41 - k_EMsgClientUninstallClientApp = 5522, // flags: 2, server type: 41 - k_EMsgClientUninstallClientAppResponse = 5523, // flags: 2, server type: 41 - k_EMsgClientSetClientAppUpdateState = 5524, // flags: 2, server type: 41 - k_EMsgClientSetClientAppUpdateStateResponse = 5525, // flags: 2, server type: 41 + k_EMsgClientGetClientAppList = 5518, // flags: 6, server type: 41 + k_EMsgClientGetClientAppListResponse = 5519, // flags: 6, server type: 41 + k_EMsgClientInstallClientApp = 5520, // flags: 6, server type: 41 + k_EMsgClientInstallClientAppResponse = 5521, // flags: 6, server type: 41 + k_EMsgClientUninstallClientApp = 5522, // flags: 6, server type: 41 + k_EMsgClientUninstallClientAppResponse = 5523, // flags: 6, server type: 41 + k_EMsgClientSetClientAppUpdateState = 5524, // flags: 6, server type: 41 + k_EMsgClientSetClientAppUpdateStateResponse = 5525, // flags: 6, server type: 41 k_EMsgClientRequestEncryptedAppTicket = 5526, // flags: 2, server type: -1 k_EMsgClientRequestEncryptedAppTicketResponse = 5527, // flags: 2, server type: -1 k_EMsgClientWalletInfoUpdate = 5528, // flags: 2, server type: -1 - k_EMsgClientLBSSetUGC = 5529, // flags: 2, server type: 34 - k_EMsgClientLBSSetUGCResponse = 5530, // flags: 2, server type: 34 + k_EMsgClientLBSSetUGC = 5529, // flags: 6, server type: 34 + k_EMsgClientLBSSetUGCResponse = 5530, // flags: 6, server type: 34 k_EMsgClientAMGetClanOfficers = 5531, // flags: 2, server type: -1 k_EMsgClientAMGetClanOfficersResponse = 5532, // flags: 2, server type: -1 k_EMsgClientCheckFileSignature = 5533, // flags: 2, server type: -1 @@ -304,8 +306,8 @@ k_EMsgClientFriendsGroupsList = 5553, // flags: 2, server type: -1 k_EMsgClientGetClanActivityCounts = 5554, // flags: 2, server type: -1 k_EMsgClientGetClanActivityCountsResponse = 5555, // flags: 2, server type: -1 - k_EMsgClientOGSReportString = 5556, // flags: 2, server type: 39 - k_EMsgClientOGSReportBug = 5557, // flags: 2, server type: 39 + k_EMsgClientOGSReportString = 5556, // flags: 6, server type: 39 + k_EMsgClientOGSReportBug = 5557, // flags: 6, server type: 39 k_EMsgClientSentLogs = 5558, // flags: 2, server type: -1 k_EMsgClientLogonGameServer = 5559, // flags: 2, server type: -1 k_EMsgAMClientCreateFriendsGroup = 5560, // flags: 2, server type: -1 @@ -324,9 +326,12 @@ k_EMsgClientRequestFreeLicenseResponse = 5573, // flags: 2, server type: -1 k_EMsgClientDRMDownloadRequestWithCrashData = 5574, // flags: 2, server type: -1 k_EMsgClientAuthListAck = 5575, // flags: 2, server type: -1 - k_EMsgClientItemAnnouncements = 5576, // flags: 2, server type: 47 - k_EMsgClientRequestItemAnnouncements = 5577, // flags: 2, server type: 47 + k_EMsgClientItemAnnouncements = 5576, // flags: 6, server type: 47 + k_EMsgClientRequestItemAnnouncements = 5577, // flags: 6, server type: 47 k_EMsgClientFriendMsgEchoToSender = 5578, // flags: 2, server type: -1 + k_EMsgClientChangeSteamGuardOptions = 5579, // flags: 2, server type: -1 + k_EMsgClientChangeSteamGuardOptionsResponse = 5580, // flags: 2, server type: -1 + k_EMsgClientOGSGameServerPingSample = 5581, // flags: 6, server type: 39 k_EMsgClientDFSAuthenticateRequest = 5605, // flags: 2, server type: -1 k_EMsgClientDFSAuthenticateResponse = 5606, // flags: 2, server type: -1 k_EMsgClientDFSEndSession = 5607, // flags: 2, server type: -1 @@ -348,33 +353,31 @@ k_EMsgClientMDSRegisterAppBuildResponse = 5839, // flags: 2, server type: -1 k_EMsgClientMDSSetAppBuildLive = 5840, // flags: 2, server type: -1 k_EMsgClientMDSSetAppBuildLiveResponse = 5841, // flags: 2, server type: -1 - k_EMsgClientMDSGetPrevDepotBuild = 5842, // flags: 2, server type: -1 - k_EMsgClientMDSGetPrevDepotBuildResponse = 5843, // flags: 2, server type: -1 - k_EMsgClientGMSServerQuery = 6403, // flags: 3, server type: 43 + k_EMsgClientGMSServerQuery = 6403, // flags: 7, server type: 43 k_EMsgGMSClientServerQueryResponse = 6404, // flags: 3, server type: -1 - k_EMsgGameServerOutOfDate = 6407, // flags: 2, server type: -1 - k_EMsgClientMMSCreateLobby = 6601, // flags: 3, server type: 42 - k_EMsgClientMMSCreateLobbyResponse = 6602, // flags: 3, server type: 42 - k_EMsgClientMMSJoinLobby = 6603, // flags: 3, server type: 42 - k_EMsgClientMMSJoinLobbyResponse = 6604, // flags: 3, server type: 42 - k_EMsgClientMMSLeaveLobby = 6605, // flags: 3, server type: 42 - k_EMsgClientMMSLeaveLobbyResponse = 6606, // flags: 3, server type: 42 - k_EMsgClientMMSGetLobbyList = 6607, // flags: 3, server type: 42 - k_EMsgClientMMSGetLobbyListResponse = 6608, // flags: 3, server type: 42 - k_EMsgClientMMSSetLobbyData = 6609, // flags: 2, server type: 42 - k_EMsgClientMMSSetLobbyDataResponse = 6610, // flags: 2, server type: 42 - k_EMsgClientMMSGetLobbyData = 6611, // flags: 3, server type: 42 - k_EMsgClientMMSLobbyData = 6612, // flags: 3, server type: 42 - k_EMsgClientMMSSendLobbyChatMsg = 6613, // flags: 2, server type: 42 - k_EMsgClientMMSLobbyChatMsg = 6614, // flags: 2, server type: 42 - k_EMsgClientMMSSetLobbyOwner = 6615, // flags: 2, server type: 42 - k_EMsgClientMMSSetLobbyOwnerResponse = 6616, // flags: 2, server type: 42 - k_EMsgClientMMSSetLobbyGameServer = 6617, // flags: 2, server type: 42 - k_EMsgClientMMSLobbyGameServerSet = 6618, // flags: 2, server type: 42 - k_EMsgClientMMSUserJoinedLobby = 6619, // flags: 2, server type: 42 - k_EMsgClientMMSUserLeftLobby = 6620, // flags: 2, server type: 42 - k_EMsgClientMMSInviteToLobby = 6621, // flags: 2, server type: 42 - k_EMsgClientMMSSetLobbyLinked = 6624, // flags: 2, server type: 42 + k_EMsgGameServerOutOfDate = 6407, // flags: 3, server type: -1 + k_EMsgClientMMSCreateLobby = 6601, // flags: 7, server type: 42 + k_EMsgClientMMSCreateLobbyResponse = 6602, // flags: 7, server type: 42 + k_EMsgClientMMSJoinLobby = 6603, // flags: 7, server type: 42 + k_EMsgClientMMSJoinLobbyResponse = 6604, // flags: 7, server type: 42 + k_EMsgClientMMSLeaveLobby = 6605, // flags: 7, server type: 42 + k_EMsgClientMMSLeaveLobbyResponse = 6606, // flags: 7, server type: 42 + k_EMsgClientMMSGetLobbyList = 6607, // flags: 7, server type: 42 + k_EMsgClientMMSGetLobbyListResponse = 6608, // flags: 7, server type: 42 + k_EMsgClientMMSSetLobbyData = 6609, // flags: 6, server type: 42 + k_EMsgClientMMSSetLobbyDataResponse = 6610, // flags: 6, server type: 42 + k_EMsgClientMMSGetLobbyData = 6611, // flags: 7, server type: 42 + k_EMsgClientMMSLobbyData = 6612, // flags: 7, server type: 42 + k_EMsgClientMMSSendLobbyChatMsg = 6613, // flags: 6, server type: 42 + k_EMsgClientMMSLobbyChatMsg = 6614, // flags: 6, server type: 42 + k_EMsgClientMMSSetLobbyOwner = 6615, // flags: 6, server type: 42 + k_EMsgClientMMSSetLobbyOwnerResponse = 6616, // flags: 6, server type: 42 + k_EMsgClientMMSSetLobbyGameServer = 6617, // flags: 6, server type: 42 + k_EMsgClientMMSLobbyGameServerSet = 6618, // flags: 6, server type: 42 + k_EMsgClientMMSUserJoinedLobby = 6619, // flags: 6, server type: 42 + k_EMsgClientMMSUserLeftLobby = 6620, // flags: 6, server type: 42 + k_EMsgClientMMSInviteToLobby = 6621, // flags: 6, server type: 42 + k_EMsgClientMMSSetLobbyLinked = 6624, // flags: 6, server type: 42 k_EMsgNonStdMsgMemcached = 6801, // flags: 0, server type: -1 k_EMsgNonStdMsgHTTPServer = 6802, // flags: 0, server type: -1 k_EMsgNonStdMsgHTTPClient = 6803, // flags: 0, server type: -1 @@ -384,45 +387,61 @@ k_EMsgNonStdMsgDFSTransfer = 6807, // flags: 0, server type: -1 k_EMsgNonStdMsgTests = 6808, // flags: 0, server type: -1 k_EMsgNonStdMsgUMQpipeAAPL = 6809, // flags: 0, server type: -1 - k_EMsgClientUDSP2PSessionStarted = 7001, // flags: 2, server type: 41 - k_EMsgClientUDSP2PSessionEnded = 7002, // flags: 2, server type: 41 - k_EMsgClientUDSInviteToGame = 7005, // flags: 2, server type: 41 - k_EMsgClientUCMAddScreenshot = 7301, // flags: 2, server type: 45 - k_EMsgClientUCMAddScreenshotResponse = 7302, // flags: 2, server type: 45 - k_EMsgClientUCMDeleteScreenshot = 7309, // flags: 2, server type: 45 - k_EMsgClientUCMDeleteScreenshotResponse = 7310, // flags: 2, server type: 45 - k_EMsgClientUCMPublishFile = 7311, // flags: 2, server type: 45 - k_EMsgClientUCMPublishFileResponse = 7312, // flags: 2, server type: 45 - k_EMsgClientUCMGetPublishedFileDetails = 7313, // flags: 2, server type: 45 - k_EMsgClientUCMGetPublishedFileDetailsResponse = 7314, // flags: 2, server type: 45 - k_EMsgClientUCMDeletePublishedFile = 7315, // flags: 2, server type: 45 - k_EMsgClientUCMDeletePublishedFileResponse = 7316, // flags: 2, server type: 45 - k_EMsgClientUCMEnumerateUserPublishedFiles = 7317, // flags: 2, server type: 45 - k_EMsgClientUCMEnumerateUserPublishedFilesResponse = 7318, // flags: 2, server type: 45 - k_EMsgClientUCMSubscribePublishedFile = 7319, // flags: 2, server type: 45 - k_EMsgClientUCMSubscribePublishedFileResponse = 7320, // flags: 2, server type: 45 - k_EMsgClientUCMEnumerateUserSubscribedFiles = 7321, // flags: 2, server type: 45 - k_EMsgClientUCMEnumerateUserSubscribedFilesResponse = 7322, // flags: 2, server type: 45 - k_EMsgClientUCMUnsubscribePublishedFile = 7323, // flags: 2, server type: 45 - k_EMsgClientUCMUnsubscribePublishedFileResponse = 7324, // flags: 2, server type: 45 - k_EMsgClientUCMUpdatePublishedFile = 7325, // flags: 2, server type: 45 - k_EMsgClientUCMUpdatePublishedFileResponse = 7326, // flags: 2, server type: 45 - k_EMsgClientUCMPublishedFileSubscribed = 7347, // flags: 2, server type: 45 - k_EMsgClientUCMPublishedFileUnsubscribed = 7348, // flags: 2, server type: 45 - k_EMsgClientRichPresenceUpload = 7501, // flags: 2, server type: 47 - k_EMsgClientRichPresenceRequest = 7502, // flags: 2, server type: 47 - k_EMsgClientRichPresenceInfo = 7503, // flags: 2, server type: 47 - k_EMsgEconTrading_InitiateTradeRequest = 7701, // flags: 2, server type: 59 - k_EMsgEconTrading_InitiateTradeProposed = 7702, // flags: 2, server type: 59 - k_EMsgEconTrading_InitiateTradeResponse = 7703, // flags: 2, server type: 59 - k_EMsgEconTrading_InitiateTradeResult = 7704, // flags: 2, server type: 59 - k_EMsgEconTrading_StartSession = 7705, // flags: 2, server type: 59 - k_EMsgEconTrading_CancelTradeRequest = 7706, // flags: 2, server type: 59 - k_EMsgClientUGSGetGlobalStats = 7901, // flags: 2, server type: 50 - k_EMsgClientUGSGetGlobalStatsResponse = 7902, // flags: 2, server type: 50 - k_EMsgCRERankByTrend = 8501, // flags: 2, server type: 53 - k_EMsgCRERankByTrendResponse = 8502, // flags: 2, server type: 53 - k_EMsgCREItemVoteSummary = 8503, // flags: 2, server type: 53 - k_EMsgCREItemVoteSummaryResponse = 8504, // flags: 2, server type: 53 - k_EMsgCRERankByVote = 8505, // flags: 2, server type: 53 - k_EMsgCRERankByVoteResponse = 8506, // flags: 2, server type: 53 + k_EMsgClientUDSP2PSessionStarted = 7001, // flags: 6, server type: 41 + k_EMsgClientUDSP2PSessionEnded = 7002, // flags: 6, server type: 41 + k_EMsgClientUDSInviteToGame = 7005, // flags: 6, server type: 41 + k_EMsgClientUCMAddScreenshot = 7301, // flags: 6, server type: 45 + k_EMsgClientUCMAddScreenshotResponse = 7302, // flags: 6, server type: 45 + k_EMsgClientUCMDeleteScreenshot = 7309, // flags: 6, server type: 45 + k_EMsgClientUCMDeleteScreenshotResponse = 7310, // flags: 6, server type: 45 + k_EMsgClientUCMPublishFile = 7311, // flags: 6, server type: 45 + k_EMsgClientUCMPublishFileResponse = 7312, // flags: 6, server type: 45 + k_EMsgClientUCMGetPublishedFileDetails = 7313, // flags: 6, server type: 45 + k_EMsgClientUCMGetPublishedFileDetailsResponse = 7314, // flags: 6, server type: 45 + k_EMsgClientUCMDeletePublishedFile = 7315, // flags: 6, server type: 45 + k_EMsgClientUCMDeletePublishedFileResponse = 7316, // flags: 6, server type: 45 + k_EMsgClientUCMEnumerateUserPublishedFiles = 7317, // flags: 6, server type: 45 + k_EMsgClientUCMEnumerateUserPublishedFilesResponse = 7318, // flags: 6, server type: 45 + k_EMsgClientUCMSubscribePublishedFile = 7319, // flags: 6, server type: 45 + k_EMsgClientUCMSubscribePublishedFileResponse = 7320, // flags: 6, server type: 45 + k_EMsgClientUCMEnumerateUserSubscribedFiles = 7321, // flags: 6, server type: 45 + k_EMsgClientUCMEnumerateUserSubscribedFilesResponse = 7322, // flags: 6, server type: 45 + k_EMsgClientUCMUnsubscribePublishedFile = 7323, // flags: 6, server type: 45 + k_EMsgClientUCMUnsubscribePublishedFileResponse = 7324, // flags: 6, server type: 45 + k_EMsgClientUCMUpdatePublishedFile = 7325, // flags: 6, server type: 45 + k_EMsgClientUCMUpdatePublishedFileResponse = 7326, // flags: 6, server type: 45 + k_EMsgClientUCMPublishedFileSubscribed = 7347, // flags: 6, server type: 45 + k_EMsgClientUCMPublishedFileUnsubscribed = 7348, // flags: 6, server type: 45 + k_EMsgClientUCMGetPublishedFilesForUser = 7360, // flags: 6, server type: 45 + k_EMsgClientUCMGetPublishedFilesForUserResponse = 7361, // flags: 6, server type: 45 + k_EMsgClientUCMSetUserPublishedFileAction = 7364, // flags: 6, server type: 45 + k_EMsgClientUCMSetUserPublishedFileActionResponse = 7365, // flags: 6, server type: 45 + k_EMsgClientUCMEnumeratePublishedFilesByUserAction = 7366, // flags: 6, server type: 45 + k_EMsgClientUCMEnumeratePublishedFilesByUserActionResponse = 7367, // flags: 6, server type: 45 + k_EMsgClientRichPresenceUpload = 7501, // flags: 6, server type: 47 + k_EMsgClientRichPresenceRequest = 7502, // flags: 6, server type: 47 + k_EMsgClientRichPresenceInfo = 7503, // flags: 6, server type: 47 + k_EMsgClientFSGetFollowerCount = 7515, // flags: 6, server type: 47 + k_EMsgClientFSGetFollowerCountResponse = 7516, // flags: 6, server type: 47 + k_EMsgClientFSGetIsFollowing = 7517, // flags: 6, server type: 47 + k_EMsgClientFSGetIsFollowingResponse = 7518, // flags: 6, server type: 47 + k_EMsgClientFSEnumerateFollowingList = 7519, // flags: 6, server type: 47 + k_EMsgClientFSEnumerateFollowingListResponse = 7520, // flags: 6, server type: 47 + k_EMsgEconTrading_InitiateTradeRequest = 7701, // flags: 6, server type: 59 + k_EMsgEconTrading_InitiateTradeProposed = 7702, // flags: 6, server type: 59 + k_EMsgEconTrading_InitiateTradeResponse = 7703, // flags: 6, server type: 59 + k_EMsgEconTrading_InitiateTradeResult = 7704, // flags: 6, server type: 59 + k_EMsgEconTrading_StartSession = 7705, // flags: 6, server type: 59 + k_EMsgEconTrading_CancelTradeRequest = 7706, // flags: 6, server type: 59 + k_EMsgClientUGSGetGlobalStats = 7901, // flags: 6, server type: 50 + k_EMsgClientUGSGetGlobalStatsResponse = 7902, // flags: 6, server type: 50 + k_EMsgCRERankByTrend = 8501, // flags: 6, server type: 53 + k_EMsgCRERankByTrendResponse = 8502, // flags: 6, server type: 53 + k_EMsgCREItemVoteSummary = 8503, // flags: 6, server type: 53 + k_EMsgCREItemVoteSummaryResponse = 8504, // flags: 6, server type: 53 + k_EMsgCRERankByVote = 8505, // flags: 6, server type: 53 + k_EMsgCRERankByVoteResponse = 8506, // flags: 6, server type: 53 + k_EMsgCREUpdateUserPublishedItemVote = 8507, // flags: 6, server type: 53 + k_EMsgCREUpdateUserPublishedItemVoteResponse = 8508, // flags: 6, server type: 53 + k_EMsgCREGetUserPublishedItemVoteDetails = 8509, // flags: 6, server type: 53 + k_EMsgCREGetUserPublishedItemVoteDetailsResponse = 8510, // flags: 6, server type: 53 diff --git a/Resources/NetHook2/NetHook2/crypto.cpp b/Resources/NetHook2/NetHook2/crypto.cpp index ac089968..76f3bdb4 100644 --- a/Resources/NetHook2/NetHook2/crypto.cpp +++ b/Resources/NetHook2/NetHook2/crypto.cpp @@ -12,7 +12,7 @@ bool (__cdecl *Encrypt_Orig)(const uint8*, uint32, const uint8*, uint32, uint8*, uint32*, const uint8*, uint32) = 0; -bool (__cdecl *Decrypt_Orig)(const uint8*, uint32, uint8*, uint32*, const uint8*, uint32) = 0; +bool (__cdecl *Decrypt_Orig)(const uint8*, uint32, const uint8*, uint32, uint8*, uint32*, const uint8*, uint32) = 0; bool (__cdecl *GetMessageFn)( int * ) = 0; @@ -66,7 +66,7 @@ CCrypto::CCrypto() (void **)&pDecrypt ); - Decrypt_Orig = (bool (__cdecl *)(const uint8*, uint32, uint8*, uint32*, const uint8*, uint32))( pDecrypt - 0x134 ); // begin praying + Decrypt_Orig = (bool (__cdecl *)(const uint8*, uint32, const uint8*, uint32, uint8*, uint32*, const uint8*, uint32))( pDecrypt - 0x134 ); // begin praying g_pLogger->LogConsole( "CCrypto::SymmetricDecrypt = 0x%x\n", Decrypt_Orig ); @@ -141,7 +141,7 @@ CCrypto::CCrypto() static bool (__cdecl *encrypt)(const uint8*, uint32, const uint8*, uint32, uint8*, uint32*, const uint8*, uint32) = &CCrypto::SymmetricEncrypt; - static bool (__cdecl *decrypt)(const uint8*, uint32, uint8*, uint32*, const uint8*, uint32) = &CCrypto::SymmetricDecrypt; + static bool (__cdecl *decrypt)(const uint8*, uint32, const uint8*, uint32, uint8*, uint32*, const uint8*, uint32) = &CCrypto::SymmetricDecrypt; if ( bEncrypt ) { @@ -195,9 +195,9 @@ bool __cdecl CCrypto::SymmetricEncrypt( const uint8 *pubPlaintextData, uint32 cu return (*Encrypt_Orig)( pubPlaintextData, cubPlaintextData, pIV, cubIV, pubEncryptedData, pcubEncryptedData, pubKey, cubKey ); } -bool __cdecl CCrypto::SymmetricDecrypt( const uint8 *pubEncryptedData, uint32 cubEncryptedData, uint8 *pubPlaintextData, uint32 *pcubPlaintextData, const uint8 *pubKey, uint32 cubKey ) +bool __cdecl CCrypto::SymmetricDecrypt( const uint8 *pubEncryptedData, uint32 cubEncryptedData, const uint8 *pIV, uint32 cubIV, uint8 *pubPlaintextData, uint32 *pcubPlaintextData, const uint8 *pubKey, uint32 cubKey ) { - bool ret = (*Decrypt_Orig)(pubEncryptedData, cubEncryptedData, pubPlaintextData, pcubPlaintextData, pubKey, cubKey); + bool ret = (*Decrypt_Orig)(pubEncryptedData, cubEncryptedData, pIV, cubIV, pubPlaintextData, pcubPlaintextData, pubKey, cubKey); g_pLogger->LogNetMessage( k_eNetIncoming, pubPlaintextData, *pcubPlaintextData ); diff --git a/Resources/NetHook2/NetHook2/crypto.h b/Resources/NetHook2/NetHook2/crypto.h index 8acdbc9d..d31f10ab 100644 --- a/Resources/NetHook2/NetHook2/crypto.h +++ b/Resources/NetHook2/NetHook2/crypto.h @@ -22,7 +22,7 @@ public: CSimpleDetour* Decrypt_Detour; static bool __cdecl SymmetricEncrypt( const uint8 *pubPlaintextData, uint32 cubPlaintextData, const uint8* pIV, uint32 cubIV, uint8 *pubEncryptedData, uint32 *pcubEncryptedData, const uint8 *pubKey, uint32 cubKey ); - static bool __cdecl SymmetricDecrypt( const uint8 *pubEncryptedData, uint32 cubEncryptedData, uint8 *pubPlaintextData, uint32 *pcubPlaintextData, const uint8 *pubKey, uint32 cubKey ); + static bool __cdecl SymmetricDecrypt( const uint8 *pubEncryptedData, uint32 cubEncryptedData, const uint8* pIV, uint32 cubIV, uint8 *pubPlaintextData, uint32 *pcubPlaintextData, const uint8 *pubKey, uint32 cubKey ); };