From 5dcc70c8d29f59512d811cad3ee6fba5d0ed182c Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Mon, 7 Mar 2011 11:14:35 -0800 Subject: [PATCH] 1) Add new code-signing certificate (signed under Cloud.com) 2) Rename vmops->Cloud in places that have customer exposure --- pwdmgr-win/win/codesign/code_signing_cert.pfx | Bin 0 -> 3196 bytes pwdmgr-win/win/codesign/sign-vmops.bat | 7 +- .../win/service/VMOps Instance Manager.rgs | 4 +- .../service/VMOps Instance Manager.vcxproj | 4 +- pwdmgr-win/win/service/VMOpsLogger.cpp | 6 +- pwdmgr-win/win/setup/setup.vdproj | 84 +++++++----------- 6 files changed, 44 insertions(+), 61 deletions(-) create mode 100644 pwdmgr-win/win/codesign/code_signing_cert.pfx diff --git a/pwdmgr-win/win/codesign/code_signing_cert.pfx b/pwdmgr-win/win/codesign/code_signing_cert.pfx new file mode 100644 index 0000000000000000000000000000000000000000..a5ce094ad7d3df600e4ef9b064f68c3617de2a4f GIT binary patch literal 3196 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 MJC`{={nrEj4@-KOPXGV_ literal 0 HcmV?d00001 diff --git a/pwdmgr-win/win/codesign/sign-vmops.bat b/pwdmgr-win/win/codesign/sign-vmops.bat index 20c9086e24e..1838d16b10e 100644 --- a/pwdmgr-win/win/codesign/sign-vmops.bat +++ b/pwdmgr-win/win/codesign/sign-vmops.bat @@ -1,6 +1,7 @@ -signtool sign /f vmopscert.pfx /p vmops /t http://tsa.starfieldtech.com %1\VMOpsInstanceManager.msi -signtool sign /f vmopscert.pfx /p vmops /t http://tsa.starfieldtech.com %1\VMOpsInstanceManager.msi - +REM signtool sign /f vmopscert.pfx /p vmops /t http://tsa.starfieldtech.com %1\CloudInstanceManager.msi +REM signtool sign /f vmopscert.pfx /p vmops /t http://tsa.starfieldtech.com %1\CloudInstanceManager.msi +signtool sign /f code_signing_cert.pfx /p vmops.com /t http://tsa.starfieldtech.com %1\CloudInstanceManager.msi +signtool sign /f code_signing_cert.pfx /p vmops.com /t http://tsa.starfieldtech.com %1\CloudInstanceManager.msi diff --git a/pwdmgr-win/win/service/VMOps Instance Manager.rgs b/pwdmgr-win/win/service/VMOps Instance Manager.rgs index e5fa53e86e4..77927bf3559 100644 --- a/pwdmgr-win/win/service/VMOps Instance Manager.rgs +++ b/pwdmgr-win/win/service/VMOps Instance Manager.rgs @@ -2,8 +2,8 @@ HKCR { NoRemove AppID { - '%APPID%' = s 'VMOpsInstanceManager' - 'vmopsservice.exe' + '%APPID%' = s 'CloudInstanceManager' + 'cloudservice.exe' { val AppID = s '%APPID%' } diff --git a/pwdmgr-win/win/service/VMOps Instance Manager.vcxproj b/pwdmgr-win/win/service/VMOps Instance Manager.vcxproj index b5c054347d9..d72e9a10c40 100644 --- a/pwdmgr-win/win/service/VMOps Instance Manager.vcxproj +++ b/pwdmgr-win/win/service/VMOps Instance Manager.vcxproj @@ -79,7 +79,7 @@ netapi32.lib;iphlpapi.lib;wininet.lib;%(AdditionalDependencies) - $(OutDir)vmopsservice.exe + $(OutDir)cloudservice.exe true Windows MachineX86 @@ -120,7 +120,7 @@ netapi32.lib;iphlpapi.lib;wininet.lib;%(AdditionalDependencies) - $(OutDir)vmopsservice.exe + $(OutDir)cloudservice.exe true Windows true diff --git a/pwdmgr-win/win/service/VMOpsLogger.cpp b/pwdmgr-win/win/service/VMOpsLogger.cpp index aa716a71007..75e971952db 100644 --- a/pwdmgr-win/win/service/VMOpsLogger.cpp +++ b/pwdmgr-win/win/service/VMOpsLogger.cpp @@ -40,7 +40,7 @@ BOOL CLogger::Initialize() GetModuleFileName(NULL, achPath, _MAX_PATH); _tsplitpath(achPath, achDrive, achDir, NULL, NULL); - _tmakepath(achPath, achDrive, achDir, _T("vmops"), _T(".log")); + _tmakepath(achPath, achDrive, achDir, _T("cloud"), _T(".log")); m_pFile = _tfopen(achPath, _T("a+")); return m_pFile != NULL; @@ -54,12 +54,12 @@ void CLogger::RotateLog() GetModuleFileName(NULL, achPath, _MAX_PATH); _tsplitpath(achPath, achDrive, achDir, NULL, NULL); - _tmakepath(achPath, achDrive, achDir, _T("vmops"), _T(".log")); + _tmakepath(achPath, achDrive, achDir, _T("cloud"), _T(".log")); TCHAR achPath2[_MAX_PATH]; GetModuleFileName(NULL, achPath2, _MAX_PATH); _tsplitpath(achPath2, achDrive, achDir, NULL, NULL); - _tmakepath(achPath2, achDrive, achDir, _T("vmops"), _T(".log.bak")); + _tmakepath(achPath2, achDrive, achDir, _T("cloud"), _T(".log.bak")); MoveFileEx(achPath, achPath2, MOVEFILE_REPLACE_EXISTING); } diff --git a/pwdmgr-win/win/setup/setup.vdproj b/pwdmgr-win/win/setup/setup.vdproj index 13cb3990812..699ffa7bf99 100644 --- a/pwdmgr-win/win/setup/setup.vdproj +++ b/pwdmgr-win/win/setup/setup.vdproj @@ -15,13 +15,7 @@ { "Entry" { - "MsmKey" = "8:_55A9B5507C4141F2854209DAF400F795" - "OwnerKey" = "8:_UNDEFINED" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_D7F1DD58C60C46D1BDEB8499DC8150FA" + "MsmKey" = "8:_4BD24FEDCF1C454D97CAB3043F1B4532" "OwnerKey" = "8:_UNDEFINED" "MsmSig" = "8:_UNDEFINED" } @@ -33,7 +27,7 @@ "DisplayName" = "8:Debug" "IsDebugOnly" = "11:TRUE" "IsReleaseOnly" = "11:FALSE" - "OutputFilename" = "8:..\\bin\\Debug\\VMOpsInstanceManager.msi" + "OutputFilename" = "8:..\\bin\\Debug\\CloudInstanceManager.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -65,7 +59,7 @@ "DisplayName" = "8:Release" "IsDebugOnly" = "11:FALSE" "IsReleaseOnly" = "11:TRUE" - "OutputFilename" = "8:..\\bin\\Release\\VMOpsInstanceManager.msi" + "OutputFilename" = "8:..\\bin\\Release\\CloudInstanceManager.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -97,31 +91,31 @@ { "CustomAction" { - "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_135C0FC6511049DC8A04B3F7710C26AB" + "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_5F8C50B71E4B4A658082C37C55C89C43" { - "Name" = "8:vmopsservice.exe" + "Name" = "8:cloudservice.exe" "Condition" = "8:" - "Object" = "8:_55A9B5507C4141F2854209DAF400F795" - "FileType" = "3:2" - "InstallAction" = "3:1" - "Arguments" = "8:/Service" - "EntryPoint" = "8:" - "Sequence" = "3:1" - "Identifier" = "8:_44CA86D9_1902_4A87_81E5_A2898BB288F1" - "InstallerClass" = "11:FALSE" - "CustomActionData" = "8:" - } - "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_A2F9F0CBAE284171BD966C402B687EFB" - { - "Name" = "8:vmopsservice.exe" - "Condition" = "8:" - "Object" = "8:_55A9B5507C4141F2854209DAF400F795" + "Object" = "8:_4BD24FEDCF1C454D97CAB3043F1B4532" "FileType" = "3:2" "InstallAction" = "3:4" "Arguments" = "8:/UnregServer" "EntryPoint" = "8:" "Sequence" = "3:1" - "Identifier" = "8:_23916BF0_68CC_41A8_9C61_70A444549196" + "Identifier" = "8:_4D65764C_D67E_4B27_87E7_B37C4A531116" + "InstallerClass" = "11:FALSE" + "CustomActionData" = "8:" + } + "{4AA51A2D-7D85-4A59-BA75-B0809FC8B380}:_8414EE7730664D4A9997F8DD95926204" + { + "Name" = "8:cloudservice.exe" + "Condition" = "8:" + "Object" = "8:_4BD24FEDCF1C454D97CAB3043F1B4532" + "FileType" = "3:2" + "InstallAction" = "3:1" + "Arguments" = "8:/Service" + "EntryPoint" = "8:" + "Sequence" = "3:1" + "Identifier" = "8:_1556871C_D5B0_4B13_8B8B_2B74B72211B7" "InstallerClass" = "11:FALSE" "CustomActionData" = "8:" } @@ -136,14 +130,22 @@ { "LaunchCondition" { + "{A06ECF26-33A3-4562-8140-9B0E340D4F24}:_E12834A9B12C4927A9DB4525051DF55C" + { + "Name" = "8:.NET Framework" + "Message" = "8:[VSDNETMSG]" + "FrameworkVersion" = "8:.NETFramework,Version=v4.0,Profile=Client" + "AllowLaterVersions" = "11:FALSE" + "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=131000" + } } } "File" { - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_55A9B5507C4141F2854209DAF400F795" + "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4BD24FEDCF1C454D97CAB3043F1B4532" { - "SourcePath" = "8:..\\bin\\Release\\vmopsservice.exe" - "TargetName" = "8:vmopsservice.exe" + "SourcePath" = "8:..\\bin\\Release\\cloudservice.exe" + "TargetName" = "8:cloudservice.exe" "Tag" = "8:" "Folder" = "8:_C239EFF6D5514C779D4C4F9566A171B8" "Condition" = "8:" @@ -160,26 +162,6 @@ "IsDependency" = "11:FALSE" "IsolateTo" = "8:" } - "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_D7F1DD58C60C46D1BDEB8499DC8150FA" - { - "SourcePath" = "8:header_logo.JPG" - "TargetName" = "8:header_logo.JPG" - "Tag" = "8:" - "Folder" = "8:_C239EFF6D5514C779D4C4F9566A171B8" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:FALSE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:FALSE" - "IsolateTo" = "8:" - } } "FileType" { @@ -237,7 +219,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Cloud.com VM Instance Manager" "ProductCode" = "8:{CF1EDAC1-1EF6-495A-8211-8EECEE496060}" - "PackageCode" = "8:{BC086418-B24B-4152-AA2B-12178382DD18}" + "PackageCode" = "8:{F17332D4-9B0F-4876-BCC5-DDAE675ED23B}" "UpgradeCode" = "8:{24149E96-AFD7-4183-8507-7778FC637D39}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE"