Skip to content

Commit

Permalink
Address Inconsistent Memory Zeroing
Browse files Browse the repository at this point in the history
  • Loading branch information
NoMoreFood committed Oct 15, 2022
1 parent b72e8c8 commit 8396354
Show file tree
Hide file tree
Showing 29 changed files with 77 additions and 78 deletions.
Binary file modified binaries/puttycac-0.77u2-installer.msi
Binary file not shown.
Binary file modified binaries/puttycac-0.77u2.zip
Binary file not shown.
Binary file modified binaries/puttycac-64bit-0.77u2-installer.msi
Binary file not shown.
Binary file modified binaries/puttycac-64bit-0.77u2.zip
Binary file not shown.
132 changes: 66 additions & 66 deletions binaries/puttycac-hash.txt
@@ -1,81 +1,81 @@

Algorithm Hash Path
--------- ---- ----
SHA256 ECF18D75457948061A252E161D8E1EFCCD13365BE53C00B8A912D9FCE2116F33 x64\pageant.exe
SHA256 F68869C020423971EE32954BB1E66CBAF3D52D01BA38912C5361C38B328DAF0F x64\plink.exe
SHA256 69560EB45D3E3A7E1DA22A7BCC35DC9FC67D4D06BF72CBF89B6D067E9B3D16C5 x64\pscp.exe
SHA256 B236C62529AB7FBD37765F723C4AE7D9E51790A2CF409355C608941CC115A7FE x64\psftp.exe
SHA256 5AD700C0533AC5882CD52E3D22CC5EF24B54157749EC417D1C5E87904C2E94D3 x64\pterm.exe
SHA256 06FE3C0DE085FC1A6D3E11FF73FAB89688630EE716B8C545B341387A7A5BF75D x64\putty.exe
SHA256 379F9A7C93074C3FF37B0E4D3DFBE79F970498862BADB23A6C46D56543588704 x64\puttygen.exe
SHA256 27F9DD750DBC0573741898EB793F20F8AF5865412F4639C319DE12A7E0E880D9 x64\puttyimp.exe
SHA256 11D8E1360F28C4C515EAFF6D1E59AA96933C804DD93B58711D4617AECAAE97EF x64\puttytel.exe
SHA256 33A409CF51DDD9E6848B51D26C97FDE8739CDF1EE18EB5E0A5B298AD990636FC x86\pageant.exe
SHA256 B4A89FDDD4261509E39F6B2C52E24BEE00D7AA47356E93288636E8830FB06B46 x86\plink.exe
SHA256 4B7E5F771C32C180C35DC04FF4207BE0E4ADCB5333E516726A2E4730C25DAB51 x86\pscp.exe
SHA256 E0E136E19AA696CD8D5EA00C62E6287C66F52C55F09D9F809B96A0D9C9F165F5 x86\psftp.exe
SHA256 906A42C4E1F3765DBE0C2652E08D88D88089FB12576FC32744CB92045ED9539F x86\pterm.exe
SHA256 2936C842ED7D9545097A41535D16FE83476288543055FE9D9E5C1EB40C54961D x86\putty.exe
SHA256 AEF1B0E6BCE322F7F9C1072A953843E176C3E54125C94C88CE7A266526F46F07 x86\puttygen.exe
SHA256 B350ACC647C3328F62401AE1C35395B7594E1BA0F14E139B89400A66D5B0F877 x86\puttyimp.exe
SHA256 7E799A0E69DDFA1A264A931C98D687B566DA47DEC99A57F484BBDCEFB45D2063 x86\puttytel.exe
SHA256 44D0C15BC5E407C3E0160B79246F7D1722FB0994FD7FA65EE8CB1F77CE28E65E puttycac-0.77u2-installer.msi
SHA256 55245EE301FF49793FAB0D1DCABEDF25B820FD95AEFC0D943D931C9C7B273D22 puttycac-0.77u2.zip
SHA256 9ADABD6C7C354EA01866B3083B6697782D35CE959156988BCC80E42A41A3D72C puttycac-64bit-0.77u2-installer.msi
SHA256 58F93D6D8ACDDBD9B2D60C0319E5D04B3FB57CFD87DCB861DA86C79EFA5F6401 puttycac-64bit-0.77u2.zip
SHA256 59E9281BFAEA97B70340C7CEBD9819DC3A936365D5C5A3A3035A67EFBB07F279 x64\pageant.exe
SHA256 3D6EDED0E445143585961C2F41764561C5AFE7EAAFD2B906E73954BE82F8DC45 x64\plink.exe
SHA256 EA66470D23043B36A50F2715ECCE8ADFFE0CAE90271FF4E2153EDB38FC1949DA x64\pscp.exe
SHA256 E196A6631518F78E6E104D4879C7879A62CAB2EFCA93C114AFD9CF66C0C5A765 x64\psftp.exe
SHA256 CD2A4E6EC2DEFBA414803D10695B31DE90071ACF1093B401694A88D8A1BF20A4 x64\pterm.exe
SHA256 0DFC2EE46A66B6C999E24B4565A049FEFD63DD41671BFCD53A23563230F4B5EB x64\putty.exe
SHA256 47E82AE6876A986030F24569FEA6E26DA58B6838EE48E0EDBF5837B5AA2A2D05 x64\puttygen.exe
SHA256 2F2B4A8860FE7F1C14A03909C5A6D6784A37D858EA6B9765061F4A3F99FEE526 x64\puttyimp.exe
SHA256 5E409A2E68AE8D6AAE31E270E020260F0F73C7FF0792494E239BA05B51866288 x64\puttytel.exe
SHA256 694E194A039CD2C8CBBB53078B004F58633F7CC142E3FD92AA70D49FAF004B42 x86\pageant.exe
SHA256 1EFDEE12335551C6683D6C9B657018C8B0422DFC2BB7498C0218F5F42A52603B x86\plink.exe
SHA256 C2BFC26AC770AA981B8D82AD1F3C7D5B39FE6F59B71778DEB83416401FA71D40 x86\pscp.exe
SHA256 A27215260EEC195BB52B33161AB4B08F6CA814D9D032CB5F8BD0ADE28E92FCD1 x86\psftp.exe
SHA256 639C56980DFDC5BFD98872FEA3C41133BA02F641C289D7BD76C2CE7FD5E0422F x86\pterm.exe
SHA256 5DCD23CB3A7AC62BF9A9372F8136367EEDF230177C389C728E2A78AB9EA68FE8 x86\putty.exe
SHA256 FB808167E2C183173A26D6647CA81D2902D41AAFEB8D8B1A9A09BBB3D3DDA6ED x86\puttygen.exe
SHA256 AAC441836AF3E8D1A213C8C79D00A653E702BBDD1D9B7708B0E8FDE503F315E3 x86\puttyimp.exe
SHA256 110071004EEC95FDF2B6F7CB34BA5EA9A984E6B65D7B0CBD21CFAF22A4A37892 x86\puttytel.exe
SHA256 5590A2B63F5AC87FFEF6BAFBF45AD4B97EE32411B3CE2FCBFBB257E7D34C6175 puttycac-0.77u2-installer.msi
SHA256 59FDF55B3498D549A4F793CF3005456DB8EDD2914A22F54760477E38AC0E9B07 puttycac-0.77u2.zip
SHA256 E17EEBC4943F90AC4A48DD99A9A60000FD3908F92F562979F4189D2E8767B9D5 puttycac-64bit-0.77u2-installer.msi
SHA256 BF451F06FD5BF6208FBD5DECB7F9D89C2E7A806F3501634CE6AD6B0983BC1065 puttycac-64bit-0.77u2.zip



Algorithm Hash Path
--------- ---- ----
SHA1 C150708FA59AA0DB3575F25F9BD5C5D872AFAC07 x64\pageant.exe
SHA1 1D63C6B7ACCE608FCDCE22920C5A02FB533B672A x64\plink.exe
SHA1 73F34EB1E619668F7AA2C2768762CC4EDDD3F92F x64\pscp.exe
SHA1 704E0014A72D9E36A234F141CC00082D7CDFA9EC x64\psftp.exe
SHA1 9757506D207D3C40A9AA937A7E2B1F566E7A23E0 x64\pterm.exe
SHA1 08492106C4DF319D2338AA99513465B6B6212485 x64\putty.exe
SHA1 5A9D4BA3A9FFE9A360C3D1C11BE52799487608BC x64\puttygen.exe
SHA1 1743B362CD39824DCAE5025D436917FD2E9E1FB3 x64\puttyimp.exe
SHA1 D6F1A53BFFB7197DAD587CA4BDCB2C7EC0A17C97 x64\puttytel.exe
SHA1 6928A4869F340AA0C6A5ECE69D52653540F0FBF5 x86\pageant.exe
SHA1 F69DEAA7B9DE368471410097BE88B681C5F0FDD3 x86\plink.exe
SHA1 CF2C5CA4AF8492E3C7EB4BAA738575DA11BAC28C x86\pscp.exe
SHA1 AC751F7F25744C87DAB7AA8FC92FB4A0449B1375 x86\psftp.exe
SHA1 05731AC303DDA2B414B3A009AD98A707D515B430 x86\pterm.exe
SHA1 E27CB37752782E4ABCBBE49835255A3B2EC2C4B5 x86\putty.exe
SHA1 0B58BDB0D50B8A0DB24149B7646713073180B387 x86\puttygen.exe
SHA1 560BE89499B993C50DF8EB4C560068514FC9787C x86\puttyimp.exe
SHA1 F263B84AFCF97101E48FBA54A0F4C368BE87683B x86\puttytel.exe
SHA1 F86E31576C993232C2DBE8797C986BD6C2A06225 puttycac-0.77u2-installer.msi
SHA1 C8FAEE1F80AA4CCA877821D2508F26FDBF058206 puttycac-0.77u2.zip
SHA1 67DA8B72A70A3CB8B28B7B7AF0CA548D437A08D5 puttycac-64bit-0.77u2-installer.msi
SHA1 0CFBFABD23BB4C1E330BC0A31C77B09BEB457D70 puttycac-64bit-0.77u2.zip
SHA1 3811B46C568475687CD60374F620651B4C44087F x64\pageant.exe
SHA1 6B9AE2A4B8634FC6096E595CEFD9D73FA785D945 x64\plink.exe
SHA1 241306ED9BCCFFC4E51A940ABC65317AD3AE5D54 x64\pscp.exe
SHA1 1D9E22360DF010CE9D9BF6648BA31C12F705546B x64\psftp.exe
SHA1 FB3FB36DABA51D19632A8682D8997B73F606A187 x64\pterm.exe
SHA1 F8841AC03C4B1BB9AD3C3F15B757EC917184C467 x64\putty.exe
SHA1 6451423CBA4E8FB02B1D1876442EA88192A1559D x64\puttygen.exe
SHA1 578358F1684FFB7F3C60BF2FFA17ABB6470F8E48 x64\puttyimp.exe
SHA1 6C8D4B0D66EB1A0500AA3384358DF335D8E7A46A x64\puttytel.exe
SHA1 C7FFDB97FD8A7DC4B974F60E8EC9E3C6CA47269E x86\pageant.exe
SHA1 9226C5DA104577D6A6A867C30C0C5518645D23A7 x86\plink.exe
SHA1 CD2913E9F6E91C01744301FA1A4E43E03D931BF8 x86\pscp.exe
SHA1 958020F5D5A73FD6BBBCD01926320843A2918281 x86\psftp.exe
SHA1 F91989C58403008B67B1C06E2207AB8E40F29A35 x86\pterm.exe
SHA1 8A775FCF68362F689B3D959CD7468D415C9D1502 x86\putty.exe
SHA1 3C64600756E4588BC30214F8ADA2CF2F29C47CA8 x86\puttygen.exe
SHA1 A98F7088D04BD3631BCF0C48AA8B38898AF96933 x86\puttyimp.exe
SHA1 58682032E4FD09F3E6F5455B8206EEAE781C9024 x86\puttytel.exe
SHA1 B6CAE6DAECEA6F74768EA3E88232762E4D42B324 puttycac-0.77u2-installer.msi
SHA1 653F7D3C41A543C3AACEBD30038033E65BE3A15D puttycac-0.77u2.zip
SHA1 FABD910F2547D7B7D44A02FA23E19862B225F695 puttycac-64bit-0.77u2-installer.msi
SHA1 6E60A664C064497E37FF83D5B6F54FB33C2B7855 puttycac-64bit-0.77u2.zip



Algorithm Hash Path
--------- ---- ----
MD5 A5AACB886A7326AB4A75BDC7B0BD7F88 x64\pageant.exe
MD5 02F908A29EF74316E797653431E64796 x64\plink.exe
MD5 61B6DC26B12FD970B1DC4A34694650D1 x64\pscp.exe
MD5 732D34D89099CFF860D1C217FE0CD1C6 x64\psftp.exe
MD5 F04174C5BC220D204B582AA21DBE1375 x64\pterm.exe
MD5 B3BBAA934DBA67732924DBAD3C7D0868 x64\putty.exe
MD5 8994D451F3E1C7107C6F5AF50F33805E x64\puttygen.exe
MD5 C72148F85A6DE056E8FDA5AAF48AA017 x64\puttyimp.exe
MD5 F2F7DE750DBE94691858BB329F258C0B x64\puttytel.exe
MD5 2C0458F7552B600537B955467D496283 x86\pageant.exe
MD5 A8329A3499533DD568E536F4B98F078B x86\plink.exe
MD5 22A9B701C1AE1B90BFD3C5A60517C489 x86\pscp.exe
MD5 D721FA927606CCB4B8373E66578C805C x86\psftp.exe
MD5 822F80E607A55048BB1DEDAD0ED13188 x86\pterm.exe
MD5 624F8F365D5229F7D7C15632613F38DF x86\putty.exe
MD5 8E421CD24C6330A61BDB8C40B3C46D2A x86\puttygen.exe
MD5 E89FA96A0E5C162E37838BB2F5485656 x86\puttyimp.exe
MD5 2AE1C3D30A73C792607BDCB8666D1175 x86\puttytel.exe
MD5 EF680E22836012F74753601D2E438345 puttycac-0.77u2-installer.msi
MD5 76B4719BFD55AB96A9ADBBBCFD07AA17 puttycac-0.77u2.zip
MD5 75399CA0F157C66E11F2DE9E0EED102C puttycac-64bit-0.77u2-installer.msi
MD5 C05ECD96B1914B4F6D1D7005E1890B69 puttycac-64bit-0.77u2.zip
MD5 76184817D3652C4345A913E83E5DD7D0 x64\pageant.exe
MD5 0BE0E2297CB7B49D85F366B5FCCAEA69 x64\plink.exe
MD5 6B5DB12850A4A3DDDFEF7619390823ED x64\pscp.exe
MD5 4ED5D6BA0EAF332C08788166A3822095 x64\psftp.exe
MD5 8D9F9E40B43D195E6472691727E40C45 x64\pterm.exe
MD5 42B9CEE50487E31C01EA329A9BD5B0FD x64\putty.exe
MD5 C72093FE27D1271471367A3EA1410D9C x64\puttygen.exe
MD5 82055A0E77645946BDABA9CAF3536C46 x64\puttyimp.exe
MD5 30E2267637BB3D8A11878A7EC87FD193 x64\puttytel.exe
MD5 B5EFCC811D5A6AF06F6DF826688F704D x86\pageant.exe
MD5 A325198C53EE540533723E9388F7D719 x86\plink.exe
MD5 F40AC38439655C9289F4BA7790560143 x86\pscp.exe
MD5 6E02371BDD6F8DA8B01E9BC826B4F773 x86\psftp.exe
MD5 8DEEE02FC9C6E3AB0BA1C5FFBF57FC7C x86\pterm.exe
MD5 86E904C3A442BCCF8340A042813A276C x86\putty.exe
MD5 1C88025D3C945C38C4EDD2D232E476B0 x86\puttygen.exe
MD5 5561332D84C89FCAE03D8F3C7D41D009 x86\puttyimp.exe
MD5 4B89B4A9C795683C83CE341A576E2B95 x86\puttytel.exe
MD5 EBE8492A5346D4A3835565630D2129BC puttycac-0.77u2-installer.msi
MD5 EE9BF35E14B6E75847B01B9D4EAECBB2 puttycac-0.77u2.zip
MD5 F0F535813886593531A4C40C5800787C puttycac-64bit-0.77u2-installer.msi
MD5 6B364146C7E362C4862D8D99C1B97374 puttycac-64bit-0.77u2.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/pterm.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/puttyimp.exe
Binary file not shown.
Binary file modified binaries/x64/puttytel.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/pterm.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/puttyimp.exe
Binary file not shown.
Binary file modified binaries/x86/puttytel.exe
Binary file not shown.
4 changes: 2 additions & 2 deletions code/cert/cert_common.c
Expand Up @@ -353,7 +353,7 @@ struct ssh2_userkey* cert_get_ssh_userkey(LPCSTR szCert, PCERT_CONTEXT pCertCont
{
// create a new putty rsa structure fill out all non-private params
struct RSAKey* rsa = snew(struct RSAKey);
ZeroMemory(rsa, sizeof(struct eddsa_key));
ZeroMemory(rsa, sizeof(struct RSAKey));
rsa->sshk.vt = find_pubkey_alg("ssh-rsa");

RSAPUBKEY* pPublicKey = (RSAPUBKEY*)(pbPublicKeyBlob + sizeof(BLOBHEADER));
Expand Down Expand Up @@ -424,7 +424,7 @@ struct ssh2_userkey* cert_get_ssh_userkey(LPCSTR szCert, PCERT_CONTEXT pCertCont

// create ecdsa struture to hold our key params
struct ecdsa_key* ec = snew(struct ecdsa_key);
ZeroMemory(ec, sizeof(struct eddsa_key));
ZeroMemory(ec, sizeof(struct ecdsa_key));
ec_nist_alg_and_curve_by_bits(iKeyLength, &(ec->curve), &(ec->sshk.vt));
ec->privateKey = mp_from_integer(0);

Expand Down
2 changes: 1 addition & 1 deletion code/config.c
Expand Up @@ -899,7 +899,7 @@ void fido_event_handler(union control* ctrl, dlgparam* dlg, void* data, int even
{
// alert user of success and ask about assignment
if (MessageBoxW(NULL, L"FIDO OpenSSH key import was successful " \
"and has been added to the FIDO cache. Do you want to assign the key to the current session?",
L"and has been added to the FIDO cache. Do you want to assign the key to the current session?",
L"FIDO OpenSSH Key Import Successful", MB_SYSTEMMODAL | MB_ICONQUESTION | MB_YESNO) == IDYES)
{
char* szCert = dupprintf("FIDO:%s", szAppId);
Expand Down
4 changes: 2 additions & 2 deletions packager/chocolatey/putty cac.nuspec
Expand Up @@ -2,14 +2,14 @@
<package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
<metadata>
<id>putty-cac</id>
<version>0.77-r1</version>
<version>0.77-r2</version>
<packageSourceUrl>https://github.com/RufusJWB/puTTY-CAC-Chocolatey</packageSourceUrl>
<owners>Rufus J.W. Buschart</owners>
<title>puTTY CAC (Install)</title>
<authors>Robert de Bath, Joris van Rantwijk, Delian Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry, Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus Kuhn, Colin Watson, Christopher Staite, Lorenz Diener, Christian Brabandt, Jeff Smith, Pavel Kryukov, Maxim Kuznetsov, Svyatoslav Kuzmich, Nico Williams, Viktor Dukhovni, Daniel Risacher, Joshua Dantzler, Bryan Berns, and CORE SDI S.A.</authors>
<projectUrl>https://github.com/NoMoreFood/putty-cac/releases</projectUrl>
<copyright>1997-2022 Simon Tatham</copyright>
<iconUrl>https://cdn.rawgit.com/RufusJWB/puTTY-CAC-Chocolatey/c12a0204/puTTY%20CAC/PuTTY_icon_128px.png</iconUrl>
<iconUrl>https://github.com/NoMoreFood/putty-cac/raw/master/packager/chocolatey/PuTTY_icon_128px.png</iconUrl>
<licenseUrl>https://raw.githubusercontent.com/NoMoreFood/putty-cac/master/code/LICENCE</licenseUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<projectSourceUrl>https://github.com/NoMoreFood/putty-cac</projectSourceUrl>
Expand Down
1 change: 0 additions & 1 deletion packager/chocolatey/tools/chocolateybeforemodify.ps1

This file was deleted.

4 changes: 2 additions & 2 deletions packager/chocolatey/tools/chocolateyinstall.ps1
Expand Up @@ -14,9 +14,9 @@ $packageArgs = @{

softwareName = 'PuTTY CAC*'

checksum = '44D0C15BC5E407C3E0160B79246F7D1722FB0994FD7FA65EE8CB1F77CE28E65E'
checksum = '5590A2B63F5AC87FFEF6BAFBF45AD4B97EE32411B3CE2FCBFBB257E7D34C6175'
checksumType = 'sha256'
checksum64 = '9ADABD6C7C354EA01866B3083B6697782D35CE959156988BCC80E42A41A3D72C'
checksum64 = 'E17EEBC4943F90AC4A48DD99A9A60000FD3908F92F562979F4189D2E8767B9D5'
checksumType64= 'sha256'

silentArgs = "/qn /norestart /l*v `"$($env:TEMP)\$($packageName).$($env:chocolateyPackageVersion).MsiInstall.log`""
Expand Down
8 changes: 4 additions & 4 deletions packager/winget/NoMoreFood.PuTTY-CAC.installer.yaml
Expand Up @@ -15,16 +15,16 @@ Installers:
InstallerType: msi
Scope: machine
InstallerUrl: https://github.com/NoMoreFood/putty-cac/raw/0.77u2/binaries/puttycac-64bit-0.77u2-installer.msi
InstallerSha256: 9ADABD6C7C354EA01866B3083B6697782D35CE959156988BCC80E42A41A3D72C
InstallerSha256: E17EEBC4943F90AC4A48DD99A9A60000FD3908F92F562979F4189D2E8767B9D5
UpgradeBehavior: install
ProductCode: '{190433A3-E8AD-4514-B94F-41E9FF76E446}'
ProductCode: '{9BE09B71-08A0-4224-8852-7233061E2808}'
- InstallerLocale: en-US
Architecture: x86
InstallerType: msi
Scope: machine
InstallerUrl: https://github.com/NoMoreFood/putty-cac/raw/0.77u2/binaries/puttycac-0.77u2-installer.msi
InstallerSha256: 58F93D6D8ACDDBD9B2D60C0319E5D04B3FB57CFD87DCB861DA86C79EFA5F6401
InstallerSha256: 5590A2B63F5AC87FFEF6BAFBF45AD4B97EE32411B3CE2FCBFBB257E7D34C6175
UpgradeBehavior: install
ProductCode: '{7702CA7E-EF89-44F0-A2DA-B4DA23D59CFA}'
ProductCode: '{4797D62D-B429-442D-A65A-03FC5265F66E}'
ManifestType: installer
ManifestVersion: 1.1.0

0 comments on commit 8396354

Please sign in to comment.