Skip to content

Commit

Permalink
Adjusted Build To Correct Manifest Issue
Browse files Browse the repository at this point in the history
- Adjusted project build to ensure a single manifest with proper build settings was embedded in the executable.
- Changed build version to 0.70u7.
- Recompiled binaries based on latest code changes.
  • Loading branch information
NoMoreFood committed Feb 24, 2019
1 parent efe2529 commit b6f94ce
Show file tree
Hide file tree
Showing 33 changed files with 199 additions and 94 deletions.
Binary file removed binaries/puttycac-0.70u6.zip
Binary file not shown.
Binary file not shown.
Binary file added binaries/puttycac-0.70u7.zip
Binary file not shown.
Binary file removed binaries/puttycac-64bit-0.70u6.zip
Binary file not shown.
Binary file not shown.
Binary file added binaries/puttycac-64bit-0.70u7.zip
Binary file not shown.
123 changes: 63 additions & 60 deletions binaries/puttycac-hash.txt
Original file line number Diff line number Diff line change
@@ -1,75 +1,78 @@

Algorithm Hash Path
--------- ---- ----
SHA256 9658AEA0C26C7FC5476CED4D3F7CA569A656D69D48B104C223D0A0BF7DE1559A \binaries\x64\pageant.exe
SHA256 078CFE23DFD62E91E6259EFD0000E1282F57BFB4D3C3E96E5801D4DC6F20619F \binaries\x64\plink.exe
SHA256 1729D59F6BF1B4269993369ABD29B560EB97142CACBE8E706627057AFAEE96B6 \binaries\x64\pscp.exe
SHA256 7B0F4AEB6621ADEDC54A8422169264C920B1B57F5AD753AD1E2509EB6CC05472 \binaries\x64\psftp.exe
SHA256 2B9F3D50CF7B9EC5B6CD385348D6DE34A449388A1FCEDA6182CB28A0AF647743 \binaries\x64\putty.exe
SHA256 1DD3EB66F0D5ADBD4882A4AB21975A0D7739EA6E612F07E4A539C5CC6A6650D7 \binaries\x64\puttygen.exe
SHA256 ABF77D9A96666B11BD5FE512CC946F2CA0F17AECCE0CD8FE28B3BCBF0AB7B6F5 \binaries\x64\puttytel.exe
SHA256 FEA3135462966E80787E5DDD63C7FEB475F68DDCD6BE53EF8147858F11D04C90 \binaries\x64\testbn.exe
SHA256 AE64523D69D39854709C636C26EE26B5FF8BA9A852F975C4D8CEDA5B71E8E989 \binaries\x86\pageant.exe
SHA256 83B8EF096704AB666EA46C528D599F2A261CA22C29C4A9952DFD71DC82D1CC34 \binaries\x86\plink.exe
SHA256 29BBBB57945F0B17DEA7C928737689D4378329158A32197ED249C137DB7F7CAB \binaries\x86\pscp.exe
SHA256 E9E73CDA63734574F2570D8679948AA8C59BA07B8F4603027BB45CF637AD00D8 \binaries\x86\psftp.exe
SHA256 8E9F6342F3CE4691ABCC24D3FE7806C566FE7724A85CD43507162D5838AAAC84 \binaries\x86\putty.exe
SHA256 162CDBFF6ABDBEE291D4DDD3F4EFA7F0E858A3171D920F4E5D3E60E6FB0FA66E \binaries\x86\puttygen.exe
SHA256 0F2BB0F704597D85750380BC0803D3DBBF156887E6E1E76D1106D89CEDFE0E38 \binaries\x86\puttytel.exe
SHA256 87F5CAE938BE21C1E39F33072A6316D73B06D4382A5C780B987E0CFD4ABF559D \binaries\x86\testbn.exe
SHA256 0CEFA54BD3E020A109BC84575D8ABB15908F0EB4F20AD0102DE10044C394BD61 \binaries\puttycac-0.70u6-installer.msi
SHA256 321C102B4EF7AC1CA68C51A346DD651055F7336E82A9D9B396BBD8F8B1DDB547 \binaries\puttycac-0.70u6.zip
SHA256 34EC4E17C6C1E29C91CA9923C75B0008AF52B37AACFC732F14C2576398C40FAF \binaries\puttycac-64bit-0.70u6-installer.msi
SHA256 54785AF9529F7A03E8F65D94F07CA48B91976D9EA87FA4131898A3F6F16479E5 \binaries\puttycac-64bit-0.70u6.zip
SHA256 09D36B1CB5303653100A967FF6924C74D5E8F78625D12F716049C584DAE4C19E \binaries\x64\pageant.exe
SHA256 92F7E3EE02D66FC040C2E3FA34541E9914F7E004B3A9AFA1022AB3FA62539953 \binaries\x64\plink.exe
SHA256 4BED540D2624FF75AC157C94EC00BCD80365125570B8ECAB3FCB9872DD35A27A \binaries\x64\pscp.exe
SHA256 89026A78179436814BF57588CF7C4477BDC87FD4BBC1E2F43A05DDCE9DC4E2D9 \binaries\x64\psftp.exe
SHA256 5E1E253A8F830D0915E4EE1E35937F9F7FE24C9095B82688AB647ECDD144A9DF \binaries\x64\putty-gdion.exe
SHA256 F6EEF21DA8D635AA935253896AB67CB663B7E8FA944EE25C40F1B91F2C3A0E2D \binaries\x64\putty.exe
SHA256 DDCD15B6487DFA13BBE50D8D1BE13766AC0B76B2D52D1771523A51800967369B \binaries\x64\puttygen.exe
SHA256 7BFEA7DFCA8868305329D11DCC86AA488B7EC02E656AB45577355927AD48E98B \binaries\x64\puttytel.exe
SHA256 4A8C9FF51A160E9D0078FA76EBF2890DF87043DAE9EE513AFBEF34F6C57CCE2A \binaries\x64\testbn.exe
SHA256 577E9DE663D873C271EAF039D24FD1834E36B87D8AF09CE259E6BA96F129F394 \binaries\x86\pageant.exe
SHA256 D2F13345D3FB7F0045A3EE985D2131E3FF925AD06323AAEC966339EE5519CB45 \binaries\x86\plink.exe
SHA256 0DF7A14DB5E90BA77B50214CD2397092FBBC4186D9E49B0B361F2A88CAB275BE \binaries\x86\pscp.exe
SHA256 48A15EBE74475AAB36699526A626C75BDF3617B49FB8056CB527B03D5D102FC3 \binaries\x86\psftp.exe
SHA256 4563841CBF1D05D15FE2E387CF2287894DE10B3A5B182CC73F08731A90209F31 \binaries\x86\putty.exe
SHA256 D743B75C6E715330BAF033D9186E6375A85AE7153B3547F1B88D6D387F1BE61F \binaries\x86\puttygen.exe
SHA256 CE21D02F7420C67D1F2F7C10B765C83A7BE91C66066F5F6B2E0F397B82437839 \binaries\x86\puttytel.exe
SHA256 D64B7E3DA43000401D31259668961095A9DF3D9584CC0B1EE08AEF300982D7D5 \binaries\x86\testbn.exe
SHA256 726FA8BACE018A38071C913DD845823385965B1FAB820366F95EFB6D1CC8AA1D \binaries\puttycac-0.70u7-installer.msi
SHA256 1555BC55D6F56022EF5E265B08E45A724E144745502298A2076B03A379C9C6E3 \binaries\puttycac-0.70u7.zip
SHA256 04515AA98D7960252D682528BF5EE3527524C1BB8C360D8AD3DF7D173D77E70C \binaries\puttycac-64bit-0.70u7-installer.msi
SHA256 DA8994A408D9133198BE514CD09CA409C7887F836AA7D15B2065453D73F4B3D3 \binaries\puttycac-64bit-0.70u7.zip



Algorithm Hash Path
--------- ---- ----
SHA1 7645E61E6FA367125D3BD4EF9300E43023D58270 \binaries\x64\pageant.exe
SHA1 663E61F66DFA7842F2369492B2B17BDA7C575AF2 \binaries\x64\plink.exe
SHA1 BF6FFB76284C5A7C144B062CB9AB8C19AAF850FA \binaries\x64\pscp.exe
SHA1 E67BF2A99DB56CD48BE8F5F2B55A6817AA81065A \binaries\x64\psftp.exe
SHA1 5E209C9A9F3A8C2BECB44049363370F8A8A095F4 \binaries\x64\putty.exe
SHA1 CDE6EA9740AEF025DF0D75D6A3E871B36439955B \binaries\x64\puttygen.exe
SHA1 FA50DEF24D762987A603BE41CEA0CF298C5B0D38 \binaries\x64\puttytel.exe
SHA1 53252520F6EE81EC854EBF6F0549C92803173D8F \binaries\x64\testbn.exe
SHA1 564D8EEA2122FA3C59EB528A1E5A2FD98FB4A844 \binaries\x86\pageant.exe
SHA1 51076FD737C8865D509F036D88142B6EC1B5FFD3 \binaries\x86\plink.exe
SHA1 8EAA9B450982ED6E6EB6001D3F1004E53E47F46C \binaries\x86\pscp.exe
SHA1 CC238BF9AC1DCE04045D5C5E816F6B8BBCDD40F8 \binaries\x86\psftp.exe
SHA1 86ABE3A488DB02109F92E29BD9A0DEBC9907C394 \binaries\x86\putty.exe
SHA1 24E721090B1CF81C770D7C6C7F5BFC88F20C3BA8 \binaries\x86\puttygen.exe
SHA1 6E6C1AD3DEF0A1930E3FAE3394E2AC8E926C7D7E \binaries\x86\puttytel.exe
SHA1 79383822545D61727B6C4B3E50089F2FD787B61A \binaries\x86\testbn.exe
SHA1 E4D41628D202766F38F16203210CA9B6245D3F53 \binaries\puttycac-0.70u6-installer.msi
SHA1 852AF8EF8F49C01B311D048986B12B3182D1F681 \binaries\puttycac-0.70u6.zip
SHA1 FE3D0C9025371ED68440E812E5314C466083638F \binaries\puttycac-64bit-0.70u6-installer.msi
SHA1 9438CACC8E9FFE08D1B539B37B1D4678CC73ACEE \binaries\puttycac-64bit-0.70u6.zip
SHA1 A922BC52102CA19FBE7189105129C490B53F68EB \binaries\x64\pageant.exe
SHA1 AF37E4924232402E660FA543849EA1C9A5394CAE \binaries\x64\plink.exe
SHA1 547225F92D6EC89F32C45E11E816E5B0EDE33A77 \binaries\x64\pscp.exe
SHA1 C4D03ED5E0F6539E6203772136FEA39A18894DBF \binaries\x64\psftp.exe
SHA1 290408007EE3F48AD1512241B201827FD0B02AD0 \binaries\x64\putty-gdion.exe
SHA1 3620968B1D5ED7D1EA4B6322E74CE6DFA3983C0E \binaries\x64\putty.exe
SHA1 FF15DA4A8937370FAA1531A2CE99EE5E344A82C3 \binaries\x64\puttygen.exe
SHA1 BA4B615222956E98D5B8D718F33D95464AB8EBAD \binaries\x64\puttytel.exe
SHA1 073F9BDC6A58F52385E0710C08CD2EA7AE9703EF \binaries\x64\testbn.exe
SHA1 F168079858C275B642C32C631D239D39A4EC9E1B \binaries\x86\pageant.exe
SHA1 6800D31DB39630FEBB38508C2C512BD242D1EBDC \binaries\x86\plink.exe
SHA1 A471F98AAFAE7E4BADAAFC2C8CC88BF69205069F \binaries\x86\pscp.exe
SHA1 90A006124603BEECADFA5FA40D66B07AE143D6ED \binaries\x86\psftp.exe
SHA1 C0D0F88CEC5A9B8FDF8C467C5897211C416E8DEF \binaries\x86\putty.exe
SHA1 DF67CAA92B671B968CE1E97A37563F38CB5199C8 \binaries\x86\puttygen.exe
SHA1 B6FC693CDEBC016A5F083B238B8DFC2B1BDDFE0C \binaries\x86\puttytel.exe
SHA1 2AE0B73032BC4532BDBDC6094294CFB758B65C82 \binaries\x86\testbn.exe
SHA1 6E1FA2C8D610934C00AC58F4D98E4475A75D692E \binaries\puttycac-0.70u7-installer.msi
SHA1 FB5C65C80AC39E904A10812F26253DE256C54E74 \binaries\puttycac-0.70u7.zip
SHA1 5F97BB2FB0BF9385CDF7CF85BC39166C4FD98895 \binaries\puttycac-64bit-0.70u7-installer.msi
SHA1 B0C50B30AC84AC2AA3567EE8412BEF739E873D0A \binaries\puttycac-64bit-0.70u7.zip



Algorithm Hash Path
--------- ---- ----
MD5 A60FA1C70B9E3B623A5F8789841EBDC5 \binaries\x64\pageant.exe
MD5 FEE84CB0DF8F68DEAC9394B3AD66E28B \binaries\x64\plink.exe
MD5 BE0A9D13BC4243A1DA2FCADF9D4A8534 \binaries\x64\pscp.exe
MD5 9807BBECAF9CA41217CD337F173D7D20 \binaries\x64\psftp.exe
MD5 229FC0E49CCF838AD741A55EBAFD9968 \binaries\x64\putty.exe
MD5 8294618B03957ACDF5EF9F2F0D366E32 \binaries\x64\puttygen.exe
MD5 9619057D4DA8E909E8A0C01E27DCBE1C \binaries\x64\puttytel.exe
MD5 A7FEEA1265300E7C4515C8FD0556BD10 \binaries\x64\testbn.exe
MD5 2842E6340E5A0FA3DC04C6EBBBC0E09D \binaries\x86\pageant.exe
MD5 4E9A7BFF0EB7EF59F22E8C8B0FD5933F \binaries\x86\plink.exe
MD5 C2A78BE1578964E66910EDE755AD04CB \binaries\x86\pscp.exe
MD5 195346512600DFB1F7C0854A39B0CCD7 \binaries\x86\psftp.exe
MD5 DDCA5D5FD5B03C94380E2FD5B15D6318 \binaries\x86\putty.exe
MD5 8B05667BAC005350B7B5313D3371F86A \binaries\x86\puttygen.exe
MD5 956A8AF01389CC89FEF6D89DA9862598 \binaries\x86\puttytel.exe
MD5 5AFBA0CCD755DF07C04F9EC7F39F1A41 \binaries\x86\testbn.exe
MD5 FFF66BDA4F72D86AAC0690EE14BB19BC \binaries\puttycac-0.70u6-installer.msi
MD5 64B4092D806F70793A320BD5A61BE1B3 \binaries\puttycac-0.70u6.zip
MD5 7BE066FA42E14DE7AD3D89B1B6AF3D75 \binaries\puttycac-64bit-0.70u6-installer.msi
MD5 FB227F0D370A7AB040DB53566F9BD5D9 \binaries\puttycac-64bit-0.70u6.zip
MD5 3230D83DB6A083440FCCB9EB5C0BCA5B \binaries\x64\pageant.exe
MD5 977692122BE80B75D117A52C6155778D \binaries\x64\plink.exe
MD5 CE387AE5A407E0221EDD97633D4126AB \binaries\x64\pscp.exe
MD5 2197A41C7D2D2076EDB93FEBB5754FFD \binaries\x64\psftp.exe
MD5 96976D98E687D6C29FF8AB76EA0CEDB9 \binaries\x64\putty-gdion.exe
MD5 0F2EFD33E4FF0454BFCE659119F9BD0E \binaries\x64\putty.exe
MD5 778C747762EFCAB6BF4C1273DDDC0370 \binaries\x64\puttygen.exe
MD5 327E111AF3F5181896FE92AE1D74A3EB \binaries\x64\puttytel.exe
MD5 DFAAC92412FDABD4F94819B15FB46907 \binaries\x64\testbn.exe
MD5 CEA3A75B507C7E3B01ABFAAC2C418D00 \binaries\x86\pageant.exe
MD5 EA7E323DDB8F272225CFDC68357FF0AD \binaries\x86\plink.exe
MD5 13989BF4E9ED1F415C3DB24EB103058D \binaries\x86\pscp.exe
MD5 913ED77D060514063ABC407548EACDB4 \binaries\x86\psftp.exe
MD5 23742E87BA874A769B4F630EC6890EAB \binaries\x86\putty.exe
MD5 685DA89693D796861950CAFB839C1CCD \binaries\x86\puttygen.exe
MD5 4F3CA8E320013C885DEE7E4294C6D2E6 \binaries\x86\puttytel.exe
MD5 A0714F348E7E6ACF72742782581C35E6 \binaries\x86\testbn.exe
MD5 BF3472791528BDDF94C199642683C218 \binaries\puttycac-0.70u7-installer.msi
MD5 A8598A99674C5292D0F730313FD5DDA5 \binaries\puttycac-0.70u7.zip
MD5 A05A18BF7EA7942743DBB7F7B75EE040 \binaries\puttycac-64bit-0.70u7-installer.msi
MD5 9ECDED7F0B4220F1E095088672CFC9A7 \binaries\puttycac-64bit-0.70u7.zip


Binary file modified binaries/x64/pageant.exe
Binary file not shown.
Binary file modified binaries/x64/plink.exe
Binary file not shown.
Binary file modified binaries/x64/pscp.exe
Binary file not shown.
Binary file modified binaries/x64/psftp.exe
Binary file not shown.
Binary file modified binaries/x64/putty.exe
Binary file not shown.
Binary file modified binaries/x64/puttygen.exe
Binary file not shown.
Binary file modified binaries/x64/puttytel.exe
Binary file not shown.
Binary file modified binaries/x64/testbn.exe
Binary file not shown.
Binary file modified binaries/x86/pageant.exe
Binary file not shown.
Binary file modified binaries/x86/plink.exe
Binary file not shown.
Binary file modified binaries/x86/pscp.exe
Binary file not shown.
Binary file modified binaries/x86/psftp.exe
Binary file not shown.
Binary file modified binaries/x86/putty.exe
Binary file not shown.
Binary file modified binaries/x86/puttygen.exe
Binary file not shown.
Binary file modified binaries/x86/puttytel.exe
Binary file not shown.
Binary file modified binaries/x86/testbn.exe
Binary file not shown.
2 changes: 2 additions & 0 deletions misc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1211,6 +1211,8 @@ char *buildinfo(const char *newline)
strbuf_catf(buf, " 2017 / MSVC++ 14.14");
#elif _MSC_VER == 1915
strbuf_catf(buf, " 2017 / MSVC++ 14.15");
#elif _MSC_VER == 1916
strbuf_catf(buf, " 2017 / MSVC++ 14.16");
#else
strbuf_catf(buf, ", unrecognised version");
#endif
Expand Down
4 changes: 2 additions & 2 deletions packager/build.cmd
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
@ECHO OFF

:: version information
SET VER=0.70u6
SET VERN=0.70.0.6
SET VER=0.70u7
SET VERN=0.70.0.7

:: cert info to use for signing
SET CERT=2FA35B20356EFEB88F9E9B5F20221693C57100E5
Expand Down
8 changes: 4 additions & 4 deletions version.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* Generated by automated build script */
#define RELEASE 0.70-6
#define TEXTVER "Release 0.70-6"
#define SSHVER "PuTTY-Release-0.70-6"
#define BINARY_VERSION 0,70,0,6
#define RELEASE 0.70-7
#define TEXTVER "Release 0.70-7"
#define SSHVER "PuTTY-Release-0.70-7"
#define BINARY_VERSION 0,70,0,7
#define SOURCE_COMMIT "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"
16 changes: 12 additions & 4 deletions windows/VS2017/pageant/pageant.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -75,21 +75,25 @@
<OutDir>..\..\..\binaries\x86\</OutDir>
<IntDir>$(ProjectDir)\Temp\$(Configuration)\x86\</IntDir>
<LinkIncremental>false</LinkIncremental>
<EmbedManifest>false</EmbedManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<OutDir>..\..\..\binaries\x64\</OutDir>
<IntDir>$(ProjectDir)\Temp\$(Configuration)\x64\</IntDir>
<EmbedManifest>false</EmbedManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>..\..\..\binaries\x86\</OutDir>
<LinkIncremental>true</LinkIncremental>
<IntDir>$(ProjectDir)\Temp\$(Configuration)\x86\</IntDir>
<EmbedManifest>false</EmbedManifest>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>false</LinkIncremental>
<OutDir>..\..\..\binaries\x64\</OutDir>
<IntDir>$(ProjectDir)\Temp\$(Configuration)\x64\</IntDir>
<EmbedManifest>false</EmbedManifest>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
Expand Down Expand Up @@ -119,7 +123,7 @@
<TargetEnvironment>Win32</TargetEnvironment>
</Midl>
<ResourceCompile>
<Culture>0x0809</Culture>
<Culture>0x0409</Culture>
<PreprocessorDefinitions>PUTTY_CAC;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\..;..\..;..;..\..\..\cert</AdditionalIncludeDirectories>
</ResourceCompile>
Expand Down Expand Up @@ -169,7 +173,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible>
</Midl>
<ResourceCompile>
<Culture>0x0809</Culture>
<Culture>0x0409</Culture>
<PreprocessorDefinitions>PUTTY_CAC;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\..;..\..;..;..\..\..\cert</AdditionalIncludeDirectories>
</ResourceCompile>
Expand Down Expand Up @@ -216,7 +220,7 @@
<TargetEnvironment>Win32</TargetEnvironment>
</Midl>
<ResourceCompile>
<Culture>0x0809</Culture>
<Culture>0x0409</Culture>
<PreprocessorDefinitions>PUTTY_CAC;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\..;..\..;..;..\..\..\cert</AdditionalIncludeDirectories>
</ResourceCompile>
Expand All @@ -232,6 +236,9 @@
<AdditionalDependencies>advapi32.lib;comctl32.lib;comdlg32.lib;gdi32.lib;imm32.lib;ole32.lib;shell32.lib;user32.lib;winmm.lib;winspool.lib;%(AdditionalDependencies)</AdditionalDependencies>
<Profile>true</Profile>
</Link>
<Manifest>
<OutputManifestFile>$(TargetPath).manifest</OutputManifestFile>
</Manifest>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
Expand All @@ -257,7 +264,7 @@
<MkTypLibCompatible>true</MkTypLibCompatible>
</Midl>
<ResourceCompile>
<Culture>0x0809</Culture>
<Culture>0x0409</Culture>
<PreprocessorDefinitions>PUTTY_CAC;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\..;..\..;..;..\..\..\cert</AdditionalIncludeDirectories>
</ResourceCompile>
Expand All @@ -273,6 +280,7 @@
<AdditionalDependencies>advapi32.lib;comctl32.lib;comdlg32.lib;gdi32.lib;imm32.lib;ole32.lib;shell32.lib;user32.lib;winmm.lib;winspool.lib;%(AdditionalDependencies)</AdditionalDependencies>
<Profile>true</Profile>
</Link>
<Manifest />
</ItemDefinitionGroup>
<ItemGroup>
<CustomBuild Include="..\..\pageant.ico" />
Expand Down
Loading

0 comments on commit b6f94ce

Please sign in to comment.