Skip to content

Commit

Permalink
Updated Binaries For 0.71
Browse files Browse the repository at this point in the history
- Updated packager script to account for MSI installer changes.
- Added *p11*.dll to PKCS library dialog's selection filter.
- Added source/header filters for new files within Visual Studio project.
- Built and signed binaries for 0.71.
  • Loading branch information
NoMoreFood committed Mar 21, 2019
1 parent 199b661 commit 68435d8
Show file tree
Hide file tree
Showing 42 changed files with 972 additions and 304 deletions.
Binary file removed binaries/puttycac-0.70u7-installer.msi
Binary file not shown.
Binary file removed binaries/puttycac-0.70u7.zip
Binary file not shown.
Binary file added binaries/puttycac-0.71-installer.msi
Binary file not shown.
Binary file added binaries/puttycac-0.71.zip
Binary file not shown.
Binary file removed binaries/puttycac-64bit-0.70u7-installer.msi
Binary file not shown.
Binary file removed binaries/puttycac-64bit-0.70u7.zip
Binary file not shown.
Binary file added binaries/puttycac-64bit-0.71-installer.msi
Binary file not shown.
Binary file added binaries/puttycac-64bit-0.71.zip
Binary file not shown.
117 changes: 54 additions & 63 deletions binaries/puttycac-hash.txt
Original file line number Diff line number Diff line change
@@ -1,78 +1,69 @@

Algorithm Hash Path
--------- ---- ----
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
SHA256 9CF8A6AE7B00A58A7589F7CB77615E9339A8C6DC691D89C79616F03BFFC54C1A \binaries\x64\pageant.exe
SHA256 0888AA4828D27842C27E81E6A3A266C211660D03E6D2A1E829741B192C12AB53 \binaries\x64\plink.exe
SHA256 7879AD54622164BECBA1DEBAE5440F0237AB5E40B7C512E1E80957D754D1CEA6 \binaries\x64\pscp.exe
SHA256 0C151506C4C63161C7E625A8C5F602F979CC561B7608B613F7B3D4A0F852FA3B \binaries\x64\psftp.exe
SHA256 811AE4E7C4D558511F4DA0A9A9E26BD84EE78037C67029C1D3C321375ED72ECD \binaries\x64\putty.exe
SHA256 C852909435AEBF63FAB178DA4196C4F621C6B91B609B23EBCAB1A63BCEB964B3 \binaries\x64\puttygen.exe
SHA256 5132A8C8A00B971D8C1FD26FFA746BAAC5B11BD4C04DDFF703388629AE8BD7D7 \binaries\x64\puttytel.exe
SHA256 637B14768D258FB349451BC6134DAEDE83A1BB1224AF2E6904A672E71EF50EA2 \binaries\x86\pageant.exe
SHA256 58B8797766F71C53435C691C2B17E80AD08438E9F90C2E5DC47F00AA5C4CBBE1 \binaries\x86\plink.exe
SHA256 3A314CE76E77C7DACA332DC335EF247F85E5CB0AD5152F39C84845054E231949 \binaries\x86\pscp.exe
SHA256 2CB50CFB281141F685F5E007D6F7910BC9D9028F71E00CACF6DA091650989F9A \binaries\x86\psftp.exe
SHA256 16758E9BE836B3CBB8A052D9076FB1D14870E276679F37347344F3A089B3B0E9 \binaries\x86\putty.exe
SHA256 FF36517ADC16BD10524A3D10ECC71B20D8744FC58C3CB1FDB447CE25E3530ADF \binaries\x86\puttygen.exe
SHA256 96A8588E82748194F61E9AE6F8F5D79A03BBBADDFE6231AE27055EF94285DABC \binaries\x86\puttytel.exe
SHA256 72165571A3BBE5C0B4D34C1D1AD7A7E634EDB78718B492BA35A33BAFEF879213 \binaries\puttycac-0.71-installer.msi
SHA256 ECC329870F413FA2A9AC50D8ADE3C5F7F87D62E8F345DABF65B471F6E602FCAF \binaries\puttycac-0.71.zip
SHA256 22586A538C5FE74150322A3F0FFCD5FE02F061290B0DF9DBD40AF2B745CF6B58 \binaries\puttycac-64bit-0.71-installer.msi
SHA256 8B2F8993319A4B2987957CE7DFA8BCAC9B0E440BD91379DFFC0E2EF766794B0F \binaries\puttycac-64bit-0.71.zip



Algorithm Hash Path
--------- ---- ----
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
SHA1 467B7258F7A24350D46B17B8AF556B852B8AFBF3 \binaries\x64\pageant.exe
SHA1 FFA4BF7522CFA17523755E78BB8FCB83A6029B8B \binaries\x64\plink.exe
SHA1 E468C8B5A0A8666C076FA8B156BAAAE6007080D7 \binaries\x64\pscp.exe
SHA1 DF23661B2A11AA024ABE95296C0235E3C6F8FD05 \binaries\x64\psftp.exe
SHA1 7FEFDED087C68C010D5A2C72F0FD28339B7C6725 \binaries\x64\putty.exe
SHA1 BB97E87351E62AC4D73423B5F5273323366FE443 \binaries\x64\puttygen.exe
SHA1 BA901DFFB796F02BE1D229EAC2F52AF243952CF9 \binaries\x64\puttytel.exe
SHA1 C22C27804C140B0DB6D23C3D1E34D5AF98BDC97D \binaries\x86\pageant.exe
SHA1 2527F098ED455A1265F94AA992A25954C6F6D898 \binaries\x86\plink.exe
SHA1 CC9631A7A60C7976D46162C2466405C13AA33FF1 \binaries\x86\pscp.exe
SHA1 384D6F79F3F2DA2FD5D30D6E80319002D6153C9D \binaries\x86\psftp.exe
SHA1 513BAAD64D8F5A978A598D4DE0A8497BB65958E9 \binaries\x86\putty.exe
SHA1 FC1673FDF08665BD108CC18B90C0A92DCAC78E8C \binaries\x86\puttygen.exe
SHA1 FBC40286CD3765284ED7B22019CA9240504EEF4A \binaries\x86\puttytel.exe
SHA1 38411FAEF35A518A0A527ED893A966F198ED87A5 \binaries\puttycac-0.71-installer.msi
SHA1 15CFED2DEF11E8DEEFAF4D0937030502C13CDAEA \binaries\puttycac-0.71.zip
SHA1 B04CD2B58558A85243DDF123D1C728E77C4A74B1 \binaries\puttycac-64bit-0.71-installer.msi
SHA1 B43CDFC6A030E4A42915A583ACD13E51D482D7E7 \binaries\puttycac-64bit-0.71.zip



Algorithm Hash Path
--------- ---- ----
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
MD5 A9F8444EDB9553A4071944BC14BD3DBC \binaries\x64\pageant.exe
MD5 DE2E6DB85E7D1612B4FC8D34C4B228AD \binaries\x64\plink.exe
MD5 B379BABFB04CEF8C62B98010742E506E \binaries\x64\pscp.exe
MD5 3AE274E78DD8F610C7C8E36D3BCF2D03 \binaries\x64\psftp.exe
MD5 EED0798D86D2D89FDA99139BE8473824 \binaries\x64\putty.exe
MD5 0CCAA18399D176B3C71CCB9E3394EBA2 \binaries\x64\puttygen.exe
MD5 5AE4892B8FB979353270F02529E2CFD3 \binaries\x64\puttytel.exe
MD5 02CAE776F25FB3E8482CE15CCD0EA933 \binaries\x86\pageant.exe
MD5 36E45E42D50F50D1B549DC3CE6753AEF \binaries\x86\plink.exe
MD5 4E5407E9496018B1A30D2E80FDD87C0C \binaries\x86\pscp.exe
MD5 12E72F81B419203A2578AA3AB6BCA09A \binaries\x86\psftp.exe
MD5 821BDF15A959A8C3DA8F916F7A40E96A \binaries\x86\putty.exe
MD5 4AAAEC469421852A8586C7FCC2F9691B \binaries\x86\puttygen.exe
MD5 1F3131849DF109BB09A7B779B98B76AE \binaries\x86\puttytel.exe
MD5 599341D391AE1884720B1E05188BE987 \binaries\puttycac-0.71-installer.msi
MD5 FDC04854D950ED7AB2C5ADCFDD0C504C \binaries\puttycac-0.71.zip
MD5 00B74C6C70AB3C906DCE6A4CCAFF7448 \binaries\puttycac-64bit-0.71-installer.msi
MD5 E07674A1B2DDB4371D514B1E3353CD3D \binaries\puttycac-64bit-0.71.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 removed 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 removed binaries/x86/testbn.exe
Binary file not shown.
2 changes: 1 addition & 1 deletion cert/cert_pkcs.c
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ HCERTSTORE cert_pkcs_get_cert_store(LPCSTR * szHint, HWND hWnd)
ZeroMemory(&tFileNameInfo, sizeof(OPENFILENAME));
tFileNameInfo.lStructSize = sizeof(OPENFILENAME);
tFileNameInfo.hwndOwner = hWnd;
tFileNameInfo.lpstrFilter = "PKCS Library Files (*pkcs*.dll;*pks*.dll;gclib.dll)\0*pkcs*.dll;*pks*.dll;gclib.dll\0All Library Files (*.dll)\0*.dll\0\0";
tFileNameInfo.lpstrFilter = "PKCS Library Files (*pkcs*.dll;*pks*.dll;*p11*.dll;gclib.dll)\0*pkcs*.dll;*pks*.dll;*p11*.dll;gclib.dll\0All Library Files (*.dll)\0*.dll\0\0";
tFileNameInfo.lpstrTitle = "Please Select PKCS #11 Library File";
tFileNameInfo.lpstrInitialDir = szSysDir;
tFileNameInfo.Flags = OFN_FORCESHOWHIDDEN | OFN_FILEMUSTEXIST;
Expand Down
6 changes: 3 additions & 3 deletions packager/build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

:: version information
SET VER=0.71
SET VERN=0.70.0.0
SET VERN=0.71.0.0

:: cert info to use for signing
SET CERT=2FA35B20356EFEB88F9E9B5F20221693C57100E5
Expand Down Expand Up @@ -46,9 +46,9 @@ COPY /Y "%BASEDIR%\windows\README-msi.txt" "%INSTDIR%\"

:: do the build
PUSHD "%INSTDIR%"
candle -arch x86 -dWin64=no -dBuilddir="%BINDIR%\x86\\" -dWinver="%VERN%" -dPuttytextver="PuTTY CAC %VERN%" "%BASEDIR%\windows\installer.wxs"
candle -arch x86 -dWin64=no -dBuilddir="%BINDIR%\x86\\" -dDllOk=Yes -dRealPlatform=x86 -dWinver="%VERN%" -dPuttytextver="PuTTY CAC %VERN%" "%BASEDIR%\windows\installer.wxs"
light -ext WixUIExtension -ext WixUtilExtension -sval installer.wixobj -o "%BINDIR%\puttycac-%VER%-installer.msi"
candle -arch x64 -dWin64=yes -dBuilddir="%BINDIR%\x64\\" -dWinver="%VERN%" -dPuttytextver="PuTTY CAC %VERN%" "%BASEDIR%\windows\installer.wxs"
candle -arch x64 -dWin64=yes -dBuilddir="%BINDIR%\x64\\" -dDllOk=Yes -dRealPlatform=x64 -dWinver="%VERN%" -dPuttytextver="PuTTY CAC %VERN%" "%BASEDIR%\windows\installer.wxs"
light -ext WixUIExtension -ext WixUtilExtension -sval installer.wixobj -o "%BINDIR%\puttycac-64bit-%VER%-installer.msi"
POPD

Expand Down
3 changes: 3 additions & 0 deletions settings.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
#include "sshgss.h"
#endif

#ifdef PUTTY_CAC
#include "cert_common.h"
#endif // PUTTY_CAC

/* The cipher order given here is the default order. */
static const struct keyvalwhere ciphernames[] = {
Expand Down
8 changes: 4 additions & 4 deletions windows/VS2017/pageant/pageant.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
<DebugInformationFormat>None</DebugInformationFormat>
<ExceptionHandling>false</ExceptionHandling>
<IntrinsicFunctions>true</IntrinsicFunctions>
<DisableSpecificWarnings>4018;4267;4244;4201;4204;4221</DisableSpecificWarnings>
<DisableSpecificWarnings>4018;4267;4244;4201;4204;4221;4098</DisableSpecificWarnings>
<PrecompiledHeaderOutputFile />
<OmitFramePointers>true</OmitFramePointers>
<CompileAs>CompileAsC</CompileAs>
Expand Down Expand Up @@ -163,7 +163,7 @@
<ExceptionHandling>false</ExceptionHandling>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>PUTTY_CAC;NDEBUG;_WIN32_WINNT=_WIN32_WINNT_WIN6;WINVER=_WIN32_WINNT_WIN6;_WINDOWS;POSIX;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DisableSpecificWarnings>4018;4267;4244;4201;4204;4221</DisableSpecificWarnings>
<DisableSpecificWarnings>4018;4267;4244;4201;4204;4221;4098</DisableSpecificWarnings>
<PrecompiledHeaderOutputFile />
<OmitFramePointers>true</OmitFramePointers>
<CompileAs>CompileAsC</CompileAs>
Expand Down Expand Up @@ -212,7 +212,7 @@
</PrecompiledHeaderOutputFile>
<ObjectFileName>$(IntDir)\%(Filename)%(Extension).obj</ObjectFileName>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<DisableSpecificWarnings>4018;4267;4244;4201;4204;4221</DisableSpecificWarnings>
<DisableSpecificWarnings>4018;4267;4244;4201;4204;4221;4098</DisableSpecificWarnings>
<CompileAs>CompileAsC</CompileAs>
</ClCompile>
<Midl>
Expand Down Expand Up @@ -258,7 +258,7 @@
</PrecompiledHeaderOutputFile>
<ObjectFileName>$(IntDir)\%(Filename)%(Extension).obj</ObjectFileName>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<DisableSpecificWarnings>4018;4267;4244;4201;4204;4221</DisableSpecificWarnings>
<DisableSpecificWarnings>4018;4267;4244;4201;4204;4221;4098</DisableSpecificWarnings>
<CompileAs>CompileAsC</CompileAs>
</ClCompile>
<Midl>
Expand Down
Loading

0 comments on commit 68435d8

Please sign in to comment.