Merged Changes From PuTTY 0.73

- Manually merged upstream changes from PuTTY 0.73. - Rebuilt binaries for 0.73.
NoMoreFood · Oct 1, 2019 · ae5fcd5 · ae5fcd5
1 parent 78ac0f7
commit ae5fcd5
Show file tree

Hide file tree

Showing 265 changed files with 32,223 additions and 32,141 deletions.
diff --git a/Buildscr b/Buildscr
@@ -35,7 +35,7 @@ module putty
 ifeq "$(RELEASE)" "" set Ndate $(!builddate)
 ifneq "$(Ndate)" "" in . do echo $(Ndate) | perl -pe 's/(....)(..)(..)/$$1-$$2-$$3/' > date
 ifneq "$(Ndate)" "" read Date date
-set Epoch 17091 # update this at every release
+set Epoch 17161 # update this at every release
 ifneq "$(Ndate)" "" in . do echo $(Ndate) | perl -ne 'use Time::Local; /(....)(..)(..)/ and print timegm(0,0,0,$$3,$$2-1,$$1) / 86400 - $(Epoch)' > days
 ifneq "$(Ndate)" "" read Days days
 

diff --git a/CHECKLST.txt b/CHECKLST.txt
@@ -4,7 +4,7 @@ Checklists for PuTTY administrative procedures
 Going into pre-release stabilisation
 ------------------------------------
 
-When we begin to work towards a release and want to enabling
+When we begin to work towards a release and want to enable
 pre-releases on the website:
 
  - Make a branch whose tip will be the current state of the
@@ -33,19 +33,21 @@ Things to do during the branch-stabilisation period:
 
  - Do some testing of the Windows version with Minefield (you can
    build a Minefield version using 'bob . XFLAGS=-DMINEFIELD'), and of
-   the Unix version with valgrind. In particular, any headline
-   features for the release should get a workout with memory checking
-   enabled!
+   the Unix version with valgrind and/or Address Sanitiser. In
+   particular, any headline features for the release should get a
+   workout with memory checking enabled!
 
 Making a release candidate build
 --------------------------------
 
  - Make a directory to hold all the release paraphernalia. I usually
    call it ~/src/putty/X.YZ (where X.YZ will stand throughout for the
-   version number). In that directory, make a git clone of the PuTTY
-   repository, where you can make release-related commits and tags
-   tentatively, and keep them out of the way of any 'git push' you
-   might still be doing in other checkouts.
+   version number).
+
+ - Inside that directory, clone the PuTTY git repository to a
+   subdirectory ~/src/putty/X.YZ/putty. Here you can make release-
+   related commits and tags tentatively, and keep them out of the way
+   of any 'git push' you might still be doing in other checkouts.
 
  - Double-check that we have removed anything tagged with a comment
    containing the words XXX-REMOVE-BEFORE-RELEASE or
@@ -75,9 +77,13 @@ Making a release candidate build
    be), merge that branch to master.
 
  - Make a release-candidate build from the release tag, and put the
-   build.out and build.log dfiles somewhere safe. Normally I store
-   these in an adjacent directory, so I'll run a command like
-     bob -o ../X.YZ/build-X.YZ-rcN.out -l ../X.YZ/build-X.YZ-rcN.log -c X.YZ . RELEASE=X.YZ
+   build.out and build.log files somewhere safe. Normally I store
+   these inside the ~/src/putty/X.YZ directory, alongside the git
+   checkout at ~/src/putty/X.YZ/putty, so I'll sit in that checkout
+   directory and run a command like
+
+     bob -o ../build-X.YZ-rcN.out -l ../build-X.YZ-rcN.log -c X.YZ . RELEASE=X.YZ
+
    This should generate a basically valid release directory as
    `build-X.YZ-rcN.out/putty', and provide link maps and sign.sh
    alongside that.
@@ -91,12 +97,11 @@ Making a release candidate build
    one that ended up being the release.) In the 'build.X.YZ-rcN.out'
    directory, run
      sh sign.sh -r -p putty
-   and you should only have to enter the release key passphrase once,
    which will generate a clearsigned file called
    sha512sums-preliminary.gpg _outside_ the 'putty' subdirectory.
 
  - For my own safety, make the release candidate build read-only.
-     chmod -R a-w build-X.YZ-rcN.out build-X.YZ-rcN.log
+     chmod -R a-w build-X.YZ-rcN.{out,log}
 
  - Now do some checking of the release binaries, and pass them to the
    rest of the team to do some as well. Do at least these things:
@@ -111,9 +116,8 @@ Preparing to make the release
 -----------------------------
 
  - Write a release announcement (basically a summary of the changes
-   since the last release). Squirrel it away in
-   thyestes:src/putty-local/announce-<ver> in case it's needed again
-   within days of the release going out.
+   since the last release). Check the draft version into the putty-aux
+   repository, so the whole team can help wordsmith it if they want to.
 
  - Update the website, in a local checkout:
     * Write a release file in components/releases which identifies the
@@ -138,12 +142,18 @@ Preparing to make the release
  - Sign the release in full. In the `build-X.YZ-rcN.out' directory,
    re-verify that the preliminary signed checksums file has a correct
    signature on it and also matches the files you're about to sign for real:
+
      gpg -d sha512sums-preliminary.gpg | (cd putty; grep -vF ' (installer version)' | grep . | sha512sum -c)
+
    If the combined output of that pipeline reports both a good
    signature (from the release key) and a successful verification of
-   all the sha512sums, then all is well, so now run
-     sh sign.sh -r putty
-   and enter the release key passphrase a lot of times.
+   all the sha512sums, then all is well and you can do the full
+   signing (not forgetting that the directory will have been readonly
+   during the last-minute testing period):
+
+     chmod -R u+w putty
+     sh sign.sh -r putty     # and enter the release key passphrase
+     chmod -R a-w putty
 
 The actual release procedure
 ----------------------------
@@ -155,11 +165,11 @@ locally, this is the procedure for putting it up on the web.
    the release date in components/releases/X.YZ.mi.
 
  - Upload the release itself and its link maps to everywhere it needs
-   to be, by running this in the build.out directory:
-      ../release.pl --version=X.YZ --upload
+   to be, by running this in the build-X.YZ-rcN.out directory:
+      ../putty/release.pl --version=X.YZ --upload
 
  - Check that downloads via version-numbered URLs all work:
-      ../release.pl --version=X.YZ --precheck
+      ../putty/release.pl --version=X.YZ --precheck
    If this has trouble accessing chiark's ftp server, that is
    unfortunately normal; add --no-ftp and try again.
 
@@ -169,7 +179,7 @@ locally, this is the procedure for putting it up on the web.
 
  - Now verify that downloads via the 'latest' URLs are all redirected
    correctly and work:
-      ../release.pl --version=X.YZ --postcheck
+      ../putty/release.pl --version=X.YZ --postcheck
 
  - Push all the git repositories:
     * run 'git push' in the website checkout

diff --git a/LATEST.VER b/LATEST.VER
@@ -1 +1 @@
-0.72
+0.73
diff --git a/Recipe b/Recipe
@@ -1,5 +1,5 @@
 # -*- makefile -*-
-# 
+#
 # This file describes which PuTTY programs are made up from which
 # object and resource files. It is processed into the various
 # Makefiles by means of a Perl script. Makefile changes should

diff --git a/binaries/puttycac-0.72-installer.msi b/binaries/puttycac-0.72-installer.msi
diff --git a/binaries/puttycac-0.72.zip b/binaries/puttycac-0.72.zip
diff --git a/binaries/puttycac-0.73-installer.msi b/binaries/puttycac-0.73-installer.msi
diff --git a/binaries/puttycac-0.73.zip b/binaries/puttycac-0.73.zip
diff --git a/binaries/puttycac-64bit-0.72-installer.msi b/binaries/puttycac-64bit-0.72-installer.msi
diff --git a/binaries/puttycac-64bit-0.72.zip b/binaries/puttycac-64bit-0.72.zip
diff --git a/binaries/puttycac-64bit-0.73-installer.msi b/binaries/puttycac-64bit-0.73-installer.msi
diff --git a/binaries/puttycac-64bit-0.73.zip b/binaries/puttycac-64bit-0.73.zip
diff --git a/binaries/puttycac-hash.txt b/binaries/puttycac-hash.txt
@@ -1,69 +1,69 @@
 
 Algorithm       Hash                                                                   Path
 ---------       ----                                                                   ----
-SHA256          D4E8ED53B549F64593C1E1A00550BFDA60251C6DC3B31FDC98BB081C69D21A68       \binaries\x64\pageant.exe
-SHA256          6ABBCEADDCED6B09876BCBA9805E268891DF5F39C89F1EC0A78F5D0A027CC40D       \binaries\x64\plink.exe
-SHA256          0D7B5A76E100C736C0842363C3475F846E2461325683A5C3D3FE90ECEEA2B0F4       \binaries\x64\pscp.exe
-SHA256          FDD4E527506A5418A984257B9993E34F790520B5B371C8779D1E2A4E62D85A97       \binaries\x64\psftp.exe
-SHA256          BC29BD066B2209AC93CC862DC8D793A3C249E333D1E9D546D6CE68864EE3B3FA       \binaries\x64\putty.exe
-SHA256          0B31461584ACA9432F2A9E80DD4430271FA9172146A2EFE9EDCCCEE4A15EF791       \binaries\x64\puttygen.exe
-SHA256          1DBF0743338496283BB599C8A369F4AA15A3160FF74493184F8BEA8855175E6C       \binaries\x64\puttytel.exe
-SHA256          866D335EB051C4C61AB105CF527282CC6A12F9F8A75C281BAD9068D1A14B6DB2       \binaries\x86\pageant.exe
-SHA256          44EE6A1820D54AE7B647B4317EFDE52FC1439181844F1AF061C9477C169537EF       \binaries\x86\plink.exe
-SHA256          61F60E6CFF8D76E409D67A44430DCE1BCA456DC5EA72C0DDAFE161AFD1061F62       \binaries\x86\pscp.exe
-SHA256          52A7F28A794149E00956E3846A820E17F19480CE80FBC975C70CF4D1FE1281AC       \binaries\x86\psftp.exe
-SHA256          3095EDBA43A3B95B338A066B1A356B33A01722196E7DCDC33D55932FA3F213FC       \binaries\x86\putty.exe
-SHA256          2815976E85A2AA593DF74DF3F38177CD5DF93DE63F34187ECE764C44AF494657       \binaries\x86\puttygen.exe
-SHA256          020AD74C016D72E6ED8101A124B99655CED7E74F5D8B5C04E4494BF5E9B95FD0       \binaries\x86\puttytel.exe
-SHA256          731FE6CAED39416D9CD738FE70C1C43C0099B20BF0E5F3A229C8131E21AB3F0A       \binaries\puttycac-0.72-installer.msi
-SHA256          5C552793E0566B1F5401FBC4343BAC4B7134C41242FEA3ADFCFF97B3A1619F8D       \binaries\puttycac-0.72.zip
-SHA256          5799EE7200FDB4F1D81ECB3315089576168903569A1AA8DD283D984BBD1B00BC       \binaries\puttycac-64bit-0.72-installer.msi
-SHA256          A699E7451B0509CC0071AF72A1A5DCE147138DB1BE5292E79D8B68D7152BB960       \binaries\puttycac-64bit-0.72.zip
+SHA256          3994BA77E80A94590CF783CEF9E9140A8C058E0BE6DAA17F4E6A3400F7468E10       \binaries\x64\pageant.exe
+SHA256          0BBD79E5283F6F058713B6BE7FD0D756094EF141B2B6D048F43E486B1975E4BB       \binaries\x64\plink.exe
+SHA256          47D17145BC4848D3CF5279B31B1D72F279F6474FE8F72ECDF1B459B71B59CFAF       \binaries\x64\pscp.exe
+SHA256          ED75BC55E75ACC7D9BABD286D54737F2D53878CEFD51E2FCAC73BEF475DEEEE9       \binaries\x64\psftp.exe
+SHA256          9199EF19D0D5A47D9F64701E7194643600241779CE7E4A583E988EE905E6CACE       \binaries\x64\putty.exe
+SHA256          3A51EEBB1C6C0BFCC0B78DF556CD11D4E0454F85434F2755084156C4849207DD       \binaries\x64\puttygen.exe
+SHA256          AC4A60BBA5919643690E1E159A6906607B6957FCCD32128E4B7CA0440373D3FE       \binaries\x64\puttytel.exe
+SHA256          C05227216A7E9C2186D40E815F9BAA5C8B269C5916D484F338AD702214D42909       \binaries\x86\pageant.exe
+SHA256          739D530CC23F5DA48FF5256C76BF5E4FB47DEC6890A9ED2A51FD84C3EA787964       \binaries\x86\plink.exe
+SHA256          CE696091B5B976E7C6AC4F9A0FDCED019612C567C365208CE1CEF4E565E1ABAC       \binaries\x86\pscp.exe
+SHA256          81AEC6BFB5713EA3A6548D37D97A03E1CCE909CE01C71D5570DFAD1AA9ADE72A       \binaries\x86\psftp.exe
+SHA256          7E91669EE33C142A500839714670E743694E0167D2872C17BAF9419C735CACF3       \binaries\x86\putty.exe
+SHA256          2642CED9FF989204CBBBD1CF2E670757DCECF8E2E39F599F155A74E05FD13CCA       \binaries\x86\puttygen.exe
+SHA256          A49DF307F72EE412AD082BDC5705BEFD2718A77489ED6CBD0A2451969F9245B9       \binaries\x86\puttytel.exe
+SHA256          D442E87A100F2D4C4056B368B9A00F763ED4351712EEB805739C3DF143B79E9E       \binaries\puttycac-0.73-installer.msi
+SHA256          83C296A66D8CE5FD7D7BE3A80BD66551E59490BDC0C02E7F19BCA6D96F8BFD1D       \binaries\puttycac-0.73.zip
+SHA256          BB534F888DEA7150ABDA5249C393D41E64F57B9396BCBB44AABF85A06BAC412A       \binaries\puttycac-64bit-0.73-installer.msi
+SHA256          3D4751AC50083A104203C92B89B31B50C59356F8B39E7EE59775D362C089E74B       \binaries\puttycac-64bit-0.73.zip
 
 
 
 Algorithm       Hash                                                                   Path
 ---------       ----                                                                   ----
-SHA1            F703A8FB545AC5E054227E4E1897AE475225C506                               \binaries\x64\pageant.exe
-SHA1            2F2594E5128608170E628386BC9B3C1483FE4485                               \binaries\x64\plink.exe
-SHA1            390C12027644AD58FA8C4BDD50FEA444031AD567                               \binaries\x64\pscp.exe
-SHA1            9347066644AD177EB278E0217F0CE7733659E760                               \binaries\x64\psftp.exe
-SHA1            CAB4D47BD1335859B1401D0B11ACB738AD86E72D                               \binaries\x64\putty.exe
-SHA1            8326B0D4FB96943325D7EA2DEFA58E1424213B71                               \binaries\x64\puttygen.exe
-SHA1            7DCD4A4AD9E3020DAAAD885EA467C4DF6A133F77                               \binaries\x64\puttytel.exe
-SHA1            40E7BEB6A0D0E7DF240B566647238A8BCBDBEED0                               \binaries\x86\pageant.exe
-SHA1            0BCE450E73536F4601D7D6B6AF2A94CA5540D518                               \binaries\x86\plink.exe
-SHA1            43B675AEA1AEFD739766801FCA918E3C827F6285                               \binaries\x86\pscp.exe
-SHA1            2B51CA1665FAC955CFDE8CD5A992D7841AA13B23                               \binaries\x86\psftp.exe
-SHA1            C58C7F84CF06608268F3041B5476E20797C0A073                               \binaries\x86\putty.exe
-SHA1            005C244D558F076C6B73A579DA841511FDF5B46E                               \binaries\x86\puttygen.exe
-SHA1            1835C7E3B709A60EFE8AEFBB22BF0E6869167EBE                               \binaries\x86\puttytel.exe
-SHA1            7706250692C1AA143F28B91527EF00AC6592C301                               \binaries\puttycac-0.72-installer.msi
-SHA1            992E58F028753CE577FC2BCF7F5F8A877BED7FEF                               \binaries\puttycac-0.72.zip
-SHA1            453E52D44CB21D10B698267EC03BEC883A771441                               \binaries\puttycac-64bit-0.72-installer.msi
-SHA1            68B63B700361A376ABA844933FF57AFC0FB93806                               \binaries\puttycac-64bit-0.72.zip
+SHA1            06046E6CFC161DAAFBEC16E413511DE5A5738DB3                               \binaries\x64\pageant.exe
+SHA1            8F9462B41FBF19374F788FDCACA523ECC0E31EB4                               \binaries\x64\plink.exe
+SHA1            27714FC8D2074365833FC3167978EC2E990558EC                               \binaries\x64\pscp.exe
+SHA1            559FFE3D09E39DC6DB3293C832E0B80917999BFB                               \binaries\x64\psftp.exe
+SHA1            33C70A118648E3EE4813EEC33CDC5A04E77C5DCB                               \binaries\x64\putty.exe
+SHA1            3F0D776D8BF10FD180FE6A6F6A3316ED4487E74C                               \binaries\x64\puttygen.exe
+SHA1            12ADBFE1FE48E05EAE7A1B915F6F0EED06456E96                               \binaries\x64\puttytel.exe
+SHA1            1C9EC5BD97E99E4B373B17CB1C1437B27013AB8E                               \binaries\x86\pageant.exe
+SHA1            D2FCE92FFB0A5FB21FDB04FADD8DC2D2A3E440F0                               \binaries\x86\plink.exe
+SHA1            E071CE48996436FBE2B2FACB8BF2D94FA12302B7                               \binaries\x86\pscp.exe
+SHA1            D1DC6958D25410BA018C341C66A9EF80219A5251                               \binaries\x86\psftp.exe
+SHA1            B52793177644DCB4631EA09BE770D57D81DD10F3                               \binaries\x86\putty.exe
+SHA1            1A142981C648A67B110DA7A339A03626BA020E63                               \binaries\x86\puttygen.exe
+SHA1            7B35463E2A604F1195D3C1770A18BF0B2061AAD4                               \binaries\x86\puttytel.exe
+SHA1            C835674C719EF6C74D787B99763B58BBF5AD45BA                               \binaries\puttycac-0.73-installer.msi
+SHA1            571F52E2D68737F01EB4F0BFA6E423B5C5866407                               \binaries\puttycac-0.73.zip
+SHA1            D00197F6E49BD842C675BC5834092C229378D12C                               \binaries\puttycac-64bit-0.73-installer.msi
+SHA1            EEF21637F2E6C002FA065F7BDFE49EBDC179F2E7                               \binaries\puttycac-64bit-0.73.zip
 
 
 
 Algorithm       Hash                                                                   Path
 ---------       ----                                                                   ----
-MD5             5AB28E54AC931B329AB95A468FC61A87                                       \binaries\x64\pageant.exe
-MD5             FC75687D12256AC277D1D5C64D05CEE1                                       \binaries\x64\plink.exe
-MD5             789F1E71441C1A9170C92D66082A5265                                       \binaries\x64\pscp.exe
-MD5             B5FF75AA26F72A58857C1D1C73995111                                       \binaries\x64\psftp.exe
-MD5             24563AC87266CF602420210CB9D76191                                       \binaries\x64\putty.exe
-MD5             AB6183AD1D1263B5E0D58FDF9327F2C1                                       \binaries\x64\puttygen.exe
-MD5             ECDE4F5E6D900CFAFD68569A4BCD3E3D                                       \binaries\x64\puttytel.exe
-MD5             95CD328945ED5BB0AF714CDEF19A1A10                                       \binaries\x86\pageant.exe
-MD5             F4827521EAB1C554AE16ACC53182CB5E                                       \binaries\x86\plink.exe
-MD5             3E7949BAE8852197CA211B2ED6D21A8E                                       \binaries\x86\pscp.exe
-MD5             B7C5815500D0F2163AB9FE54EAF4BEC4                                       \binaries\x86\psftp.exe
-MD5             F61347965A2526C955C8B762C5F317D4                                       \binaries\x86\putty.exe
-MD5             398E2ADEFA6E5C27EE1C46E1BB5514A6                                       \binaries\x86\puttygen.exe
-MD5             BFCF09F70DC27F424AF8DA9A34B519F4                                       \binaries\x86\puttytel.exe
-MD5             7EA003BF6ED191144E75585A5885DCA7                                       \binaries\puttycac-0.72-installer.msi
-MD5             A1DA96D6A3AA6BAEB165C878259AAB59                                       \binaries\puttycac-0.72.zip
-MD5             9D1F4A81D0EA21B833CE88CC7908A218                                       \binaries\puttycac-64bit-0.72-installer.msi
-MD5             4BD0B38E7E9405891F193C4B76B3B1CD                                       \binaries\puttycac-64bit-0.72.zip
+MD5             00FE356BAD857FCAD1BB2E4C33AA579C                                       \binaries\x64\pageant.exe
+MD5             D1DB63F7F9D8A82BC36811EA3748B83F                                       \binaries\x64\plink.exe
+MD5             B11D1D749CB059EAEF6D763670A20BD3                                       \binaries\x64\pscp.exe
+MD5             1C0AE3DFFDD38DD361BA9753F5F2E382                                       \binaries\x64\psftp.exe
+MD5             E20F021EE18B25B3AB30C24A0F2EA485                                       \binaries\x64\putty.exe
+MD5             40D8D7DBEED6C7567A0777E88D52803A                                       \binaries\x64\puttygen.exe
+MD5             06A8C77F7B683BB622A4CB969AF019F0                                       \binaries\x64\puttytel.exe
+MD5             0C5583DF850A4F62B9C807074C61923E                                       \binaries\x86\pageant.exe
+MD5             CD687FED583CF03AFEBD43AD9652F9AF                                       \binaries\x86\plink.exe
+MD5             BDE8419989FFFD37F47B1480721A0063                                       \binaries\x86\pscp.exe
+MD5             747E0CB66283247B8A3DD79E0B77B24D                                       \binaries\x86\psftp.exe
+MD5             2D8D7CB4F4E4D2B095E1AE86D2B2E458                                       \binaries\x86\putty.exe
+MD5             19AC11538B92297665BB345DC258D701                                       \binaries\x86\puttygen.exe
+MD5             21DEE4B4D7CD97EB36889063B84534E5                                       \binaries\x86\puttytel.exe
+MD5             D711659A4F53502DB05882F6298CAEF5                                       \binaries\puttycac-0.73-installer.msi
+MD5             3C4EEE0F3085D49BF9054A3255A5939A                                       \binaries\puttycac-0.73.zip
+MD5             EC49257D611F8F361B0CC3FF2B2129EF                                       \binaries\puttycac-64bit-0.73-installer.msi
+MD5             7A4850C683856306811B1C028863E15C                                       \binaries\puttycac-64bit-0.73.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/putty.exe b/binaries/x64/putty.exe
diff --git a/binaries/x64/puttygen.exe b/binaries/x64/puttygen.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/putty.exe b/binaries/x86/putty.exe
diff --git a/binaries/x86/puttygen.exe b/binaries/x86/puttygen.exe
diff --git a/binaries/x86/puttytel.exe b/binaries/x86/puttytel.exe