Address Pageant Command Line Issue

NoMoreFood · Oct 14, 2022 · b72e8c8 · b72e8c8
1 parent 941d8c8
commit b72e8c8
Show file tree

Hide file tree

Showing 28 changed files with 89 additions and 81 deletions.
diff --git a/binaries/puttycac-0.77u2-installer.msi b/binaries/puttycac-0.77u2-installer.msi
diff --git a/binaries/puttycac-0.77u2.zip b/binaries/puttycac-0.77u2.zip
diff --git a/binaries/puttycac-64bit-0.77u2-installer.msi b/binaries/puttycac-64bit-0.77u2-installer.msi
diff --git a/binaries/puttycac-64bit-0.77u2.zip b/binaries/puttycac-64bit-0.77u2.zip
diff --git a/binaries/puttycac-hash.txt b/binaries/puttycac-hash.txt
@@ -1,81 +1,81 @@
 
 Algorithm       Hash                                                                   Path
 ---------       ----                                                                   ----
-SHA256          FA6530AD3B7D2C6F8E3CD23A1579EEC688DB2ADF5C20CAA2603247EF35047624       x64\pageant.exe
-SHA256          73E665C40924E203120E1DE492C68E4228FBF224E4ED026C92FE4BEECEEDB65D       x64\plink.exe
-SHA256          B01C10F6A2D96EF7BD8E48B0EE23BDE7C23D72EBA39F7A70FDB81F40D10844DF       x64\pscp.exe
-SHA256          43C41159EF68926C93BF799631A4DE9838EF3B39F276EC4CE13DDE3C11C74AB3       x64\psftp.exe
-SHA256          50816630778255B495511EC037C841A24F5988A13766CB95200AE855DBCB5250       x64\pterm.exe
-SHA256          E977B20DA692DB9ACC04EC2919BF1EAF5572676EF9CAB1DFAB5E908E512D4436       x64\putty.exe
-SHA256          2C58E61851F8BE56CEDCFA43D08F9042B75189DAA690AAD23AFC22281368702B       x64\puttygen.exe
-SHA256          234B4E5FF1B62556FFF32DBE2D1659092A68F28F639BFE201F878E2047853DB4       x64\puttyimp.exe
-SHA256          D261B5149647496833A7A94F9F6D23A44B6AD31C4C9E7515400B8CA51E8BCA77       x64\puttytel.exe
-SHA256          80F86C29211522DE9D1DD4957E0EC85417D64E5B218B2C21E120F53DF66A08E5       x86\pageant.exe
-SHA256          8B4FAAF7CD397D59F25AB89FF60CEB8F78741ADEED47EBE133F3E795E380B7AF       x86\plink.exe
-SHA256          26D0C81B39A6F0FF505592C9AC391FD7BE58F20AD0F9B71AA6D9A3C79BC5E5D6       x86\pscp.exe
-SHA256          A93B6A67B4496A819E227C36E9C10B25351167962EBD47D121241BAD4C29638B       x86\psftp.exe
-SHA256          527044467ACF8A5D2194FB0CD0527725B269BE221B74EA8C17182B4206A42F6F       x86\pterm.exe
-SHA256          15778653C068E9A94604083FC089A29479F2C216F3865FBDBB5425BC6A8DBB35       x86\putty.exe
-SHA256          7042FC6FC2DA24581C788B25749E81EC43688E931B00E69F184DD3FB0F3783F9       x86\puttygen.exe
-SHA256          CDA9BD631392C58109648A317E4E19F63560D9A31FDCD58C30BCE3CDCA985ADB       x86\puttyimp.exe
-SHA256          362A0DCDC9312E47C1AB3F78955B4DC356D7F635CE2E01ED2078DA531391563E       x86\puttytel.exe
-SHA256          EA3417E6EBE083D5126EE58DCFE735ABCAE386CDF7EB5FEE15981CF63B8D41DD       puttycac-0.77u2-installer.msi
-SHA256          3FD7A0582AF88B13646715193B9A80564E840CD27BDB18F3E5330ADFB4B58637       puttycac-0.77u2.zip
-SHA256          B6DB94116D68AB262C22426D2F762D131A0F415E17763FC4544612375785F955       puttycac-64bit-0.77u2-installer.msi
-SHA256          DAB59E2874D2900FE3E95312E4A1A02639FABDA91699A5E016E1F26FAE6367D7       puttycac-64bit-0.77u2.zip
+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
 
 
 
 Algorithm       Hash                                                                   Path
 ---------       ----                                                                   ----
-SHA1            0760A4F38CC28AA67D5AFB3AF53A42862B18FFE7                               x64\pageant.exe
-SHA1            47928B69E546F1522748CAC05275C3689F403D60                               x64\plink.exe
-SHA1            CECE7A165D42B974ECE4A1DA0E573D44D367F176                               x64\pscp.exe
-SHA1            1B1CFDC61730AD58F2E5473FE3A67CD89D76B7C0                               x64\psftp.exe
-SHA1            018E87463E932A9E14DE4F017D2C2290B14C274F                               x64\pterm.exe
-SHA1            251D51C922CDB8B56D8A37FBC72E9162060668B1                               x64\putty.exe
-SHA1            AD5725416047D946E1C88131D3FAF36A19015C07                               x64\puttygen.exe
-SHA1            B29D2EF175EFF2009F04DB71578281FCB95EF229                               x64\puttyimp.exe
-SHA1            A424D8A32C2A04FB89F2C48E977E72A9FE0F472B                               x64\puttytel.exe
-SHA1            1A64BE4D4C6BF0191CBB193C7048CDD23D71D435                               x86\pageant.exe
-SHA1            FE5296CFAA492BA7638446BBD9E9F90038AB4211                               x86\plink.exe
-SHA1            E101DD144F36B59430F7A3886668ECA59C781298                               x86\pscp.exe
-SHA1            A21C09F4FDB2D69A5EFCFEDE1D1A03328C3173C4                               x86\psftp.exe
-SHA1            8C5802B752DA2582167E7E316E35B01F36B54085                               x86\pterm.exe
-SHA1            BB3D1BE1EE63ACBCB3E495729028203F5D740B1E                               x86\putty.exe
-SHA1            D2CB9175BEC5268A7976BFA01486551706985BDC                               x86\puttygen.exe
-SHA1            C45517EBE06730CBD611664A0A360E56063BFFFD                               x86\puttyimp.exe
-SHA1            513452EDF967954F47164E83D2C55DF6619FC795                               x86\puttytel.exe
-SHA1            283FA60AAB1BEDFE27AC43BE25C08E2CEF56015E                               puttycac-0.77u2-installer.msi
-SHA1            CB491154122D713184D9134F082A9F6A1187BB22                               puttycac-0.77u2.zip
-SHA1            62DDE975F443DA05310F658F46F6E059EDA6746E                               puttycac-64bit-0.77u2-installer.msi
-SHA1            9F2C4A8324ED95077957B833EE0B3D040666C85F                               puttycac-64bit-0.77u2.zip
+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
 
 
 
 Algorithm       Hash                                                                   Path
 ---------       ----                                                                   ----
-MD5             7E59E145C2BD4DD451CE61DD9678FBF0                                       x64\pageant.exe
-MD5             7B6D96ABC4902E1B43AF3CB88DD018E4                                       x64\plink.exe
-MD5             9614A91D18C1A8A56921856E8C3781D3                                       x64\pscp.exe
-MD5             B8412B42C4D352EE247C8916C95C778D                                       x64\psftp.exe
-MD5             58F98AD2DB102EFD44EA5E500BED536D                                       x64\pterm.exe
-MD5             332F133BEA9332A8F248644CE2A3E2F7                                       x64\putty.exe
-MD5             AEE97D2D9E09B80EFB29F321475A5866                                       x64\puttygen.exe
-MD5             60074E8BC853AF5A53EFDC7C23BAF5A4                                       x64\puttyimp.exe
-MD5             34F5F9CE85037BC92CF23E932596D1BF                                       x64\puttytel.exe
-MD5             0E0C62995815C96532B26305153E8207                                       x86\pageant.exe
-MD5             BE88842A4A760E4F323176B08EA64030                                       x86\plink.exe
-MD5             A96D9ABA73FE0184505C325B23B43ECC                                       x86\pscp.exe
-MD5             CA67FCA47C61AE2FC6AE4BFC6592C2D9                                       x86\psftp.exe
-MD5             9EBBA23956BA27E05415D17E2DBD5C90                                       x86\pterm.exe
-MD5             134E6573D2F484F5650F2E3D3D4BD990                                       x86\putty.exe
-MD5             DF63152C546E63B251A0023FD1919F11                                       x86\puttygen.exe
-MD5             2E666BFF69D0245170DDD5E2DB3C0D02                                       x86\puttyimp.exe
-MD5             BA4F5A6C8EC6C2C2F999D1026A05656F                                       x86\puttytel.exe
-MD5             B7D93F027FE0F7D3889736E39D1221B6                                       puttycac-0.77u2-installer.msi
-MD5             6E03643C2DE2F682D44C8F6770700222                                       puttycac-0.77u2.zip
-MD5             4CFF1B437B1F3BEC087C645624AD965E                                       puttycac-64bit-0.77u2-installer.msi
-MD5             E177F74429BF9A1EA48502F46BB0BA70                                       puttycac-64bit-0.77u2.zip
+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
 
 
diff --git a/binaries/x64/pageant.exe b/binaries/x64/pageant.exe
diff --git a/binaries/x64/plink.exe b/binaries/x64/plink.exe
diff --git a/binaries/x64/pscp.exe b/binaries/x64/pscp.exe
diff --git a/binaries/x64/psftp.exe b/binaries/x64/psftp.exe
diff --git a/binaries/x64/pterm.exe b/binaries/x64/pterm.exe
diff --git a/binaries/x64/putty.exe b/binaries/x64/putty.exe
diff --git a/binaries/x64/puttygen.exe b/binaries/x64/puttygen.exe
diff --git a/binaries/x64/puttyimp.exe b/binaries/x64/puttyimp.exe
diff --git a/binaries/x64/puttytel.exe b/binaries/x64/puttytel.exe
diff --git a/binaries/x86/pageant.exe b/binaries/x86/pageant.exe
diff --git a/binaries/x86/plink.exe b/binaries/x86/plink.exe
diff --git a/binaries/x86/pscp.exe b/binaries/x86/pscp.exe
diff --git a/binaries/x86/psftp.exe b/binaries/x86/psftp.exe
diff --git a/binaries/x86/pterm.exe b/binaries/x86/pterm.exe
diff --git a/binaries/x86/putty.exe b/binaries/x86/putty.exe
diff --git a/binaries/x86/puttygen.exe b/binaries/x86/puttygen.exe
diff --git a/binaries/x86/puttyimp.exe b/binaries/x86/puttyimp.exe
diff --git a/binaries/x86/puttytel.exe b/binaries/x86/puttytel.exe
diff --git a/code/windows/pageant.c b/code/windows/pageant.c
@@ -1774,11 +1774,19 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
             else
                 command = "";
             break;
+#ifdef PUTTY_CAC
+        }
+        else if (cert_cmdline_parse(amo.argv[amo.index])) {
+            /*
+             * Matching processed by PuTTY CAC functions
+             */
+            amo.index++;
+#endif // PUTTY_CAC
         } else {
             opt_error("unrecognised option '%s'\n", amo.argv[amo.index]);
         }
     }
-
+    
     /*
      * Create and lock an interprocess mutex while we figure out
      * whether we're going to be the Pageant server or a client. That

diff --git a/packager/chocolatey/tools/chocolateyinstall.ps1 b/packager/chocolatey/tools/chocolateyinstall.ps1
@@ -2,8 +2,8 @@
 
 $packageName= $env:ChocolateyPackageName
 $toolsDir   = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
-$url        = 'https://github.com/NoMoreFood/putty-cac/raw/0.77u1/binaries/puttycac-0.77u1-installer.msi'
-$url64      = 'https://github.com/NoMoreFood/putty-cac/raw/0.77u1/binaries/puttycac-64bit-0.77u1-installer.msi'
+$url        = 'https://github.com/NoMoreFood/putty-cac/raw/0.77u2/binaries/puttycac-0.77u2-installer.msi'
+$url64      = 'https://github.com/NoMoreFood/putty-cac/raw/0.77u2/binaries/puttycac-64bit-0.77u2-installer.msi'
 
 $packageArgs = @{
   packageName   = $packageName
@@ -12,11 +12,11 @@ $packageArgs = @{
   url           = $url
   url64bit      = $url64
 
-  softwareName  = 'puTTY CAC*'
+  softwareName  = 'PuTTY CAC*'
 
-  checksum      = '907F201234DE8906276B0EEB9A2CD8363FB64047F0607046D6C45EF12AED8F7E'
+  checksum      = '44D0C15BC5E407C3E0160B79246F7D1722FB0994FD7FA65EE8CB1F77CE28E65E'
   checksumType  = 'sha256'
-  checksum64    = '48076176FA7D09A0A7EB51D541B736A632FFE6A709A7DF388B95398F0D8284ED'
+  checksum64    = '9ADABD6C7C354EA01866B3083B6697782D35CE959156988BCC80E42A41A3D72C'
   checksumType64= 'sha256'
 
   silentArgs    = "/qn /norestart /l*v `"$($env:TEMP)\$($packageName).$($env:chocolateyPackageVersion).MsiInstall.log`""

diff --git a/packager/winget/NoMoreFood.PuTTY-CAC.installer.yaml b/packager/winget/NoMoreFood.PuTTY-CAC.installer.yaml
@@ -1,5 +1,5 @@
 PackageIdentifier: NoMoreFood.PuTTY-CAC
-PackageVersion: 0.77.0.1
+PackageVersion: 0.77.0.2
 Platform:
 - Windows.Desktop
 MinimumOSVersion: 10.0.0.0
@@ -14,17 +14,17 @@ Installers:
   Architecture: x64
   InstallerType: msi
   Scope: machine
-  InstallerUrl: https://github.com/NoMoreFood/putty-cac/raw/0.77u1/binaries/puttycac-64bit-0.77u1-installer.msi
-  InstallerSha256: 48076176FA7D09A0A7EB51D541B736A632FFE6A709A7DF388B95398F0D8284ED
+  InstallerUrl: https://github.com/NoMoreFood/putty-cac/raw/0.77u2/binaries/puttycac-64bit-0.77u2-installer.msi
+  InstallerSha256: 9ADABD6C7C354EA01866B3083B6697782D35CE959156988BCC80E42A41A3D72C
   UpgradeBehavior: install
-  ProductCode: '{A8124469-BB62-4B6E-8BFF-44287B10E895}'
+  ProductCode: '{190433A3-E8AD-4514-B94F-41E9FF76E446}'
 - InstallerLocale: en-US
   Architecture: x86
   InstallerType: msi
   Scope: machine
-  InstallerUrl: https://github.com/NoMoreFood/putty-cac/raw/0.77u1/binaries/puttycac-0.77u1-installer.msi
-  InstallerSha256: 907F201234DE8906276B0EEB9A2CD8363FB64047F0607046D6C45EF12AED8F7E
+  InstallerUrl: https://github.com/NoMoreFood/putty-cac/raw/0.77u2/binaries/puttycac-0.77u2-installer.msi
+  InstallerSha256: 58F93D6D8ACDDBD9B2D60C0319E5D04B3FB57CFD87DCB861DA86C79EFA5F6401
   UpgradeBehavior: install
-  ProductCode: '{484F141E-A0FA-4916-9E21-4101B28915DE}'
+  ProductCode: '{7702CA7E-EF89-44F0-A2DA-B4DA23D59CFA}'
 ManifestType: installer
 ManifestVersion: 1.1.0
diff --git a/packager/winget/NoMoreFood.PuTTY-CAC.locale.en-US.yaml b/packager/winget/NoMoreFood.PuTTY-CAC.locale.en-US.yaml
@@ -1,5 +1,5 @@
 PackageIdentifier: NoMoreFood.PuTTY-CAC
-PackageVersion: 0.77.0.1
+PackageVersion: 0.77.0.2
 PackageLocale: en-US
 Publisher: Simon Tatham
 PublisherUrl: https://github.com/NoMoreFood

diff --git a/packager/winget/NoMoreFood.PuTTY-CAC.yaml b/packager/winget/NoMoreFood.PuTTY-CAC.yaml
@@ -1,5 +1,5 @@
 PackageIdentifier: NoMoreFood.PuTTY-CAC
-PackageVersion: 0.77.0.1
+PackageVersion: 0.77.0.2
 DefaultLocale: en-US
 ManifestType: version
 ManifestVersion: 1.1.0