Merge tag '0.82u1' into cnPuTTY-CAC

dZ8Lx9OwX · Dec 31, 2024 · 668a3cd · 668a3cd
2 parents 599b2f8 + 8c55c06
commit 668a3cd
Show file tree

Hide file tree

Showing 27 changed files with 102 additions and 39 deletions.
diff --git a/binaries/arm/pageant.exe b/binaries/arm/pageant.exe
diff --git a/binaries/arm/putty.exe b/binaries/arm/putty.exe
diff --git a/binaries/arm/puttyimp.exe b/binaries/arm/puttyimp.exe
diff --git a/binaries/arm64/pageant.exe b/binaries/arm64/pageant.exe
diff --git a/binaries/arm64/putty.exe b/binaries/arm64/putty.exe
diff --git a/binaries/arm64/puttyimp.exe b/binaries/arm64/puttyimp.exe
diff --git a/binaries/puttycac-0.82u1-arm.zip b/binaries/puttycac-0.82u1-arm.zip
diff --git a/binaries/puttycac-0.82u1-arm64.zip b/binaries/puttycac-0.82u1-arm64.zip
diff --git a/binaries/puttycac-0.82u1-x64.zip b/binaries/puttycac-0.82u1-x64.zip
diff --git a/binaries/puttycac-0.82u1-x86.zip b/binaries/puttycac-0.82u1-x86.zip
diff --git a/binaries/puttycac-hash.txt b/binaries/puttycac-hash.txt
@@ -0,0 +1,63 @@
+
+Algorithm       Hash                                                                   Path
+---------       ----                                                                   ----
+SHA256          634C0633AF787200C637EA9C488533631AEE1159295F66AD4782FE4E4AA39CE8       arm\pageant.exe
+SHA256          669520ADCE6228121157EF9FFADC3DA127ED67813182E0B2294805498F25A904       arm\putty.exe
+SHA256          E411D6A16EA89336138061857E1EBE8A985267964DBC35815E59445838EE0F0A       arm\puttyimp.exe
+SHA256          ACF6D669CE528DEA7090B85757FB4BBFE5431C89DE3E49D6DD520FA650959CAD       arm64\pageant.exe
+SHA256          DCC1524CC9915C0D99A6914C46FBF65182E4048C61A14A630FCE612CABFC2BC2       arm64\putty.exe
+SHA256          5C2AF52D6CD6BEB00B9BF2691FA0317ED79952B9F85AC74DA7128B7DAA51611D       arm64\puttyimp.exe
+SHA256          C8AA1AA6B55D5450507B313886B9F90AF6FB22546AED8AC38CAD114741ECC64E       x64\pageant.exe
+SHA256          5F2DD4B6C5902058A519B6F23D73636EB28F41E762D04AA3965E7D73ECE2D17B       x64\putty.exe
+SHA256          9A973C53CAEA8B98AD4BA2F5BA26B8117A5891B6F289D41421BF64946CC69222       x64\puttyimp.exe
+SHA256          7A799921CA770DCB66F006AE91074057C0C4BDADC0DDE1E2A806087CB1719E5F       x86\pageant.exe
+SHA256          0F57C755BAD6902C41D617FDE04C551C4C3E6613484AB986538CCB3A1048C2D2       x86\putty.exe
+SHA256          E6C1EE7BF98BFAB7ECEF297B1E372BEC631F2C26D92A99BBBAD0FE8C4447A84D       x86\puttyimp.exe
+SHA256          15B9A6BB1D34537C3D8DBD4D43DA3AB1BB2D3BFE30D7E195CDC690E01AB3C26F       puttycac-0.82u1-arm.zip
+SHA256          A821F9093FD4EEC548AFEEA8F479F1F92A70D82B04429E16154216EB40A0849A       puttycac-0.82u1-arm64.zip
+SHA256          36E4E0629BBFB4313AC7B94E5311B065D443FB862E789E5FFB3F2ABDFB59D0E9       puttycac-0.82u1-x64.zip
+SHA256          81869BF41A202550431B264772C8CBE45B851FCBD2B93B807F069BFAE7A76854       puttycac-0.82u1-x86.zip
+
+
+
+Algorithm       Hash                                                                   Path
+---------       ----                                                                   ----
+SHA1            9970D001EF4D88676A6255B0F5DA02C655A7B591                               arm\pageant.exe
+SHA1            0EC3F694A0A04E0953A442C5F1A28FD34EFCF6F9                               arm\putty.exe
+SHA1            9EDBFEE8F9281A8CF4528DFDDD13EFEE299E4E83                               arm\puttyimp.exe
+SHA1            18623D460609BEDBEB9D15FD610392300D2D8A14                               arm64\pageant.exe
+SHA1            02F0E7A5B69DC7D34765910EF7A2E335949CD492                               arm64\putty.exe
+SHA1            2C5C05929663869498E77C531869045FBC731874                               arm64\puttyimp.exe
+SHA1            F712393FF0EC5269819A3860EA4D4E518CA39DEA                               x64\pageant.exe
+SHA1            867728389DEB502E43FBFF1F85B5DBA12C96B5E5                               x64\putty.exe
+SHA1            9346CDBF2A57D22DF2B33600F9F9390B1D18D0D7                               x64\puttyimp.exe
+SHA1            0A7BD6172735A5DBB4E5CB421B4072A3A6FA50C1                               x86\pageant.exe
+SHA1            42FB9D762C5124CBF6623BB0EB666D93B4B3F072                               x86\putty.exe
+SHA1            A110F6444F30D39007ED7507B40ABDBE32BE0A85                               x86\puttyimp.exe
+SHA1            B3EB99C924A2A78406CDD86A686267FEF188CA7D                               puttycac-0.82u1-arm.zip
+SHA1            3BF717FCBDB96C098390C0B8908796379D7DB53D                               puttycac-0.82u1-arm64.zip
+SHA1            84ECDB075A0DC35545B01F5C7B4885FF005CB203                               puttycac-0.82u1-x64.zip
+SHA1            3395DBC5D0E65F084F7A9C310A2ACF9CFC7D2936                               puttycac-0.82u1-x86.zip
+
+
+
+Algorithm       Hash                                                                   Path
+---------       ----                                                                   ----
+MD5             925B1E5D9D8A9C2EBEC581F2044D0C1D                                       arm\pageant.exe
+MD5             3650B943DB46DEBA87829D4ED219FF61                                       arm\putty.exe
+MD5             5DBB2DD8690C176A784528411249F09F                                       arm\puttyimp.exe
+MD5             E01D05601BF8C621E5BF390A9BB19F3C                                       arm64\pageant.exe
+MD5             A83032D210EEFBA026D25C53D741459A                                       arm64\putty.exe
+MD5             0437D1F3180A6E8EE53553FC9169BAAE                                       arm64\puttyimp.exe
+MD5             8E36CEE3775802146296FDCEECB5EBFD                                       x64\pageant.exe
+MD5             1767DADE289C317168264402E37C987B                                       x64\putty.exe
+MD5             AD6969247CFC648A7004C78BB06BAF4A                                       x64\puttyimp.exe
+MD5             D45BBE81A5CC209C92B82522E65ADAF3                                       x86\pageant.exe
+MD5             3DA786265614C3206D8F32925260F605                                       x86\putty.exe
+MD5             BF51EAA08B608F7D5AFA050C8CAC654B                                       x86\puttyimp.exe
+MD5             14A8F2FBA133BC0657B96F60E6ABD2B5                                       puttycac-0.82u1-arm.zip
+MD5             6ED81DCF53D6B460C58237707F334CAA                                       puttycac-0.82u1-arm64.zip
+MD5             570804DB0224349596B14867140DD284                                       puttycac-0.82u1-x64.zip
+MD5             B07F32B1096F58DE6C0037AB3DBB1990                                       puttycac-0.82u1-x86.zip
+
+
diff --git a/binaries/x64/pageant.exe b/binaries/x64/pageant.exe
diff --git a/binaries/x64/putty.exe b/binaries/x64/putty.exe
diff --git a/binaries/x64/puttyimp.exe b/binaries/x64/puttyimp.exe
diff --git a/binaries/x86/pageant.exe b/binaries/x86/pageant.exe
diff --git a/binaries/x86/putty.exe b/binaries/x86/putty.exe
diff --git a/binaries/x86/puttyimp.exe b/binaries/x86/puttyimp.exe
diff --git a/code/LICENCE b/code/LICENCE
@@ -1,4 +1,4 @@
-PuTTY CAC is copyright 1997-2024 Simon Tatham & Bryan Berns.
+PuTTY CAC is copyright 1997-2025 Simon Tatham & Bryan Berns.
 
 部分版权属于：Robert de Bath, Joris van Rantwijk, Delian
 Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,
@@ -14,4 +14,4 @@ Daniel Risacher, Joshua Dantzler, Bryan Berns, and CORE SDI S.A.
 
 本软件按“原样”提供，不提供任何形式的保证、明示或暗示，包括但不限于适销性、特定用途的适用性和非侵权。在任何情况下，版权所有者均不承担任何责任，包括但不限于任何索赔、损害赔偿或其他责任，无论是在合同、侵权或其他，或因为相关软件及软件中的使用或其他交易等等。
 
-cnPuTTY CAC—PuTTY CAC中文版由(C)2021-2024 张朵(BI6LER) 保留所有权利。其它同上。【安全提醒】基于PuTTY CAC源码修改编译，无引入额外的功能性代码。您可以在zdIdealism@百度网盘共享下载可执行程序或者从dZ8Lx9OwX@github下载源码等相关内容进行审查编译。其它途径不确定是否相同。希望这个程序能帮到你(^o^)！
+cnPuTTY CAC—PuTTY CAC中文版由(C)2021-2025 张朵(BI6LER) 保留所有权利。其它同上。【安全提醒】基于PuTTY CAC源码修改编译，无引入额外的功能性代码。您可以从dZ8Lx9OwX@github下载源码等相关内容进行查看，其它途径不确定是否相同。希望这个程序能帮到你(^o^)！
diff --git a/code/version.h b/code/version.h
@@ -1,5 +1,5 @@
 /* Generated by automated build script */
-#define RELEASE 0.82
-#define TEXTVER "Release 0.82"
-#define SSHVER "-Release-0.82"
-#define BINARY_VERSION 0,82,0,0
+#define RELEASE 0.82-1
+#define TEXTVER "Release 0.82-1"
+#define SSHVER "-Release-0.82-1"
+#define BINARY_VERSION 0,82,0,1
diff --git a/packager/build.cmd b/packager/build.cmd
@@ -3,8 +3,8 @@ TITLE Building PuTTY-CAC
 SETLOCAL ENABLEDELAYEDEXPANSION
 
 :: version information
-SET VER=0.82
-SET VERN=0.82.0.0
+SET VER=0.82u1
+SET VERN=0.82.0.1
 
 :: setup environment variables based on location of this script
 SET INSTDIR=%~dp0
@@ -64,10 +64,10 @@ COPY /Y "%INSTDIR%\*.bmp" "%BASEDIR%\build\"
 
 :: do the build
 PUSHD "%BASEDIR%\build"
-FOR %%A IN (arm arm64 x86 x64) DO (
+FOR %%A IN (Arm Arm64 x86 x64) DO (
   IF /I "%%A" EQU "ARM64" SET WIN64=yes
   IF /I "%%A" EQU "X64" SET WIN64=yes
-  candle -arch %%A -dWin64=!WIN64! -dBuilddir="%BINDIR%\%%A\\" -dDllOk=Yes -dRealPlatform=x86 -dWinver="%VERN%" -dPUTTY_CAC=1 -dPuttytextver="PuTTY CAC %VERN%" "%BASEDIR%\windows\installer.wxs"
+  candle -arch %%A -dWin64=!WIN64! -dBuilddir="%BINDIR%\%%A\\" -dDllOk=Yes -dRealPlatform=%%A -dWinver="%VERN%" -dPUTTY_CAC=1 -dPuttytextver="PuTTY CAC %VERN%" "%BASEDIR%\windows\installer.wxs"
   light -ext WixUIExtension -ext WixUtilExtension -sval installer.wixobj -o "%BINDIR%\puttycac-%VER%-%%A.msi"
 )
 POPD

diff --git a/packager/build.vs.sln.cmd b/packager/build.vs.sln.cmd
@@ -3,8 +3,8 @@ TITLE Building PuTTY-CAC
 SETLOCAL ENABLEDELAYEDEXPANSION
 
 :: version information
-SET VER=0.82
-SET VERN=0.82.0.0
+SET VER=0.82u1
+SET VERN=0.82.0.1
 
 :: setup environment variables based on location of this script
 SET INSTDIR=%~dp0
@@ -64,10 +64,10 @@ FOR %%A IN (arm arm64 x86 x64) DO (
 
 :: do the build
 ::PUSHD "%BASEDIR%\build"
-::FOR %%A IN (arm arm64 x86 x64) DO (
+::FOR %%A IN (Arm Arm64 x86 x64) DO (
 ::  IF /I "%%A" EQU "ARM64" SET WIN64=yes
 ::  IF /I "%%A" EQU "X64" SET WIN64=yes
-::  candle -arch %%A -dWin64=!WIN64! -dBuilddir="%BINDIR%\%%A\\" -dDllOk=Yes -dRealPlatform=x86 -dWinver="%VERN%" -dPUTTY_CAC=1 -dPuttytextver="PuTTY CAC %VERN%" "%BASEDIR%\windows\installer.wxs"
+::  candle -arch %%A -dWin64=!WIN64! -dBuilddir="%BINDIR%\%%A\\" -dDllOk=Yes -dRealPlatform=%%A -dWinver="%VERN%" -dPUTTY_CAC=1 -dPuttytextver="PuTTY CAC %VERN%" "%BASEDIR%\windows\installer.wxs"
 ::  light -ext WixUIExtension -ext WixUtilExtension -sval installer.wixobj -o "%BINDIR%\puttycac-%VER%-%%A.msi"
 ::)
 ::POPD

diff --git a/packager/build.zip.hash.cmd b/packager/build.zip.hash.cmd
@@ -3,8 +3,8 @@ TITLE Building PuTTY-CAC
 SETLOCAL ENABLEDELAYEDEXPANSION
 
 :: version information
-SET VER=0.82
-SET VERN=0.82.0.0
+SET VER=0.82u1
+SET VERN=0.82.0.1
 
 :: setup environment variables based on location of this script
 SET INSTDIR=%~dp0
@@ -48,7 +48,7 @@ FOR %%A IN (arm arm64 x86 x64) DO (
 :: cleanup
 ::FOR %%X IN (Win32 x64 Debug Release Temp .vs) DO (
 ::  FORFILES /S /P "%BASEDIR%\windows" /M "%%X" /C "CMD /C IF @isdir==TRUE RD /S /Q @path" >NUL 2>&1
-::
+::)
 ::FORFILES /S /P "%BINDIR%" /M "*.*" /C "CMD /C IF /I @ext NEQ """exe""" DEL /Q @file"
 
 :: sign the main executables
@@ -64,10 +64,10 @@ FOR %%A IN (arm arm64 x86 x64) DO (
 
 :: do the build
 ::PUSHD "%BASEDIR%\build"
-::FOR %%A IN (arm arm64 x86 x64) DO (
+::FOR %%A IN (Arm Arm64 x86 x64) DO (
 ::  IF /I "%%A" EQU "ARM64" SET WIN64=yes
 ::  IF /I "%%A" EQU "X64" SET WIN64=yes
-::  candle -arch %%A -dWin64=!WIN64! -dBuilddir="%BINDIR%\%%A\\" -dDllOk=Yes -dRealPlatform=x86 -dWinver="%VERN%" -dPUTTY_CAC=1 -dPuttytextver="PuTTY CAC %VERN%" "%BASEDIR%\windows\installer.wxs"
+::  candle -arch %%A -dWin64=!WIN64! -dBuilddir="%BINDIR%\%%A\\" -dDllOk=Yes -dRealPlatform=%%A -dWinver="%VERN%" -dPUTTY_CAC=1 -dPuttytextver="PuTTY CAC %VERN%" "%BASEDIR%\windows\installer.wxs"
 ::  light -ext WixUIExtension -ext WixUtilExtension -sval installer.wixobj -o "%BINDIR%\puttycac-%VER%-%%A.msi"
 ::)
 ::POPD

diff --git a/packager/chocolatey/putty cac.nuspec b/packager/chocolatey/putty cac.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
   <metadata>
     <id>putty-cac</id>
-    <version>0.82</version>
+    <version>0.82u1</version>
     <packageSourceUrl>https://github.com/NoMoreFood/putty-cac</packageSourceUrl>
     <owners>NoMoreFood</owners>
     <title>PuTTY-CAC</title>

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.82/binaries/puttycac-0.82-x86.msi'
-$url64      = 'https://github.com/NoMoreFood/putty-cac/raw/0.82/binaries/puttycac-0.82-x64.msi'
+$url        = 'https://github.com/NoMoreFood/putty-cac/raw/0.82u1/binaries/puttycac-0.82u1-x86.msi'
+$url64      = 'https://github.com/NoMoreFood/putty-cac/raw/0.82u1/binaries/puttycac-0.82u1-x64.msi'
 
 $packageArgs = @{
   packageName   = $packageName
@@ -14,9 +14,9 @@ $packageArgs = @{
 
   softwareName  = 'PuTTY CAC*'
 
-  checksum      = 'F99437D6148C9AC72B9E55E1B820F03CE9713C41EB43134D53B8D2BB8E3A1026'
+  checksum      = 'EA60FC32F2181FC90C9060284E0113EE14B7A95FB8D150C5225DB5056DDF0CF0'
   checksumType  = 'sha256'
-  checksum64    = 'CD22D5200A9DDFA1F1E4C17057531E09A85D9FBFF8984FA1E33D58FC152C8BE3'
+  checksum64    = '8C01329F1CB0AA39CB8681A323C000DD1517AB70968371100AC5E3D11B3A89F6'
   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.82.0.0
+PackageVersion: 0.82.0.1
 Platform:
 - Windows.Desktop
 MinimumOSVersion: 10.0.0.0
@@ -10,37 +10,37 @@ InstallModes:
 FileExtensions:
 - PPK
 Installers:
-- InstallerUrl: https://github.com/NoMoreFood/putty-cac/raw/0.82/binaries/puttycac-0.82-x64.msi
+- InstallerUrl: https://github.com/NoMoreFood/putty-cac/raw/0.82u1/binaries/puttycac-0.82u1-x64.msi
   InstallerLocale: en-US
   Architecture: x64
   InstallerType: wix
   Scope: machine
-  InstallerSha256: CD22D5200A9DDFA1F1E4C17057531E09A85D9FBFF8984FA1E33D58FC152C8BE3
+  InstallerSha256: 8C01329F1CB0AA39CB8681A323C000DD1517AB70968371100AC5E3D11B3A89F6
   UpgradeBehavior: install
-  ProductCode: '{860AB9A8-3CBF-430B-A660-3E538472A0DA}'
-- InstallerUrl: https://github.com/NoMoreFood/putty-cac/raw/0.82/binaries/puttycac-0.82-x86.msi
+  ProductCode: '{FDA32E63-E264-4316-AC25-2E72CDA00505}'
+- InstallerUrl: https://github.com/NoMoreFood/putty-cac/raw/0.82u1/binaries/puttycac-0.82u1-x86.msi
   InstallerLocale: en-US
   Architecture: x86
   InstallerType: wix
   Scope: machine
-  InstallerSha256: F99437D6148C9AC72B9E55E1B820F03CE9713C41EB43134D53B8D2BB8E3A1026
+  InstallerSha256: EA60FC32F2181FC90C9060284E0113EE14B7A95FB8D150C5225DB5056DDF0CF0
   UpgradeBehavior: install
-  ProductCode: '{5A3B8E4C-1AE5-4009-B8CA-49AB09DCF741}'
-- InstallerUrl: https://github.com/NoMoreFood/putty-cac/raw/0.82/binaries/puttycac-0.82-arm64.msi
+  ProductCode: '{BC2AF598-8701-4510-AA05-9A471A964A52}'
+- InstallerUrl: https://github.com/NoMoreFood/putty-cac/raw/0.82u1/binaries/puttycac-0.82u1-arm64.msi
   InstallerLocale: en-US
   Architecture: arm64
   InstallerType: wix
   Scope: machine
-  InstallerSha256: EC8D42DFA21B339C525CE1C3E41B841698816A68850F549EF7E06D14C18FB1F3
+  InstallerSha256: 6B3ACA93C805E3B1B61021742BF72F815819C851FAFCCBA272824992709C70DB
   UpgradeBehavior: install
-  ProductCode: '{3D827814-B279-48AA-8E33-55F8689DD603}'  
-- InstallerUrl: https://github.com/NoMoreFood/putty-cac/raw/0.82/binaries/puttycac-0.82-arm.msi
+  ProductCode: '{289039B5-FAFF-46F0-AA52-2C995F45B7DE}'  
+- InstallerUrl: https://github.com/NoMoreFood/putty-cac/raw/0.82u1/binaries/puttycac-0.82u1-arm.msi
   InstallerLocale: en-US
   Architecture: arm
   InstallerType: wix
   Scope: machine
-  InstallerSha256: 40D015BA67C3CACDA3E8A47FC38EBD2E37EF502CEC679F73B5A6BD73EBE668EF
+  InstallerSha256: EE354A93F4CBE3B8255C6947887D27096BD8237AEA0AE9E5B2A2F814A5A0DCCA
   UpgradeBehavior: install
-  ProductCode: '{CCCA1DC2-A448-475B-92FD-66F6B670C532}'
+  ProductCode: '{B1657933-FA61-49A5-A9E7-13095F4D4671}'
 ManifestType: installer
 ManifestVersion: 1.6.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.82.0.0    
+PackageVersion: 0.82.0.1    
 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.82.0.0
+PackageVersion: 0.82.0.1
 DefaultLocale: en-US
 ManifestType: version
 ManifestVersion: 1.6.0