PuTTY 0.79 Release

- Merged changes from PuTTY 0.79 branch. - Built and signed binaries for 0.79.
NoMoreFood · Aug 27, 2023 · 71760ac · 71760ac
1 parent 84c17a3
commit 71760ac
Show file tree

Hide file tree

Showing 184 changed files with 2,373 additions and 1,294 deletions.
diff --git a/binaries/puttycac-0.78u1-installer.msi b/binaries/puttycac-0.78u1-installer.msi
diff --git a/binaries/puttycac-0.78u1.zip b/binaries/puttycac-0.78u1.zip
diff --git a/binaries/puttycac-0.79-installer.msi b/binaries/puttycac-0.79-installer.msi
diff --git a/binaries/puttycac-0.79.zip b/binaries/puttycac-0.79.zip
diff --git a/binaries/puttycac-64bit-0.78u1-installer.msi b/binaries/puttycac-64bit-0.78u1-installer.msi
diff --git a/binaries/puttycac-64bit-0.78u1.zip b/binaries/puttycac-64bit-0.78u1.zip
diff --git a/binaries/puttycac-64bit-0.79-installer.msi b/binaries/puttycac-64bit-0.79-installer.msi
diff --git a/binaries/puttycac-64bit-0.79.zip b/binaries/puttycac-64bit-0.79.zip
diff --git a/binaries/puttycac-hash.txt b/binaries/puttycac-hash.txt
@@ -1,81 +1,81 @@
 
 Algorithm       Hash                                                                   Path
 ---------       ----                                                                   ----
-SHA256          F79CD0172951D67421AF0A410260E915BF6DD661DEFFC90E11A265B1BE26AEC6       x64\pageant.exe
-SHA256          6D5C37B020BDF51BA4300CC4CACCC8854EDD55644578DB169997066BC2F5E7EC       x64\plink.exe
-SHA256          6CC7C669A49007E8EF38799004C98449A55582BFBE85C1D1DF62C4AD3C11D203       x64\pscp.exe
-SHA256          64B524C839C9159F280CBBD08C37C8AEC9AF8B638B42501D60492FC464D01CD6       x64\psftp.exe
-SHA256          7402E99518E6DB3C206375093212EFCEA4C052DA1ED5BE3BEC5181819AE20750       x64\pterm.exe
-SHA256          23CAFBCBD2FAC1241EBD9440539812DE3A6214D531D7DD1159CD8C5A2C5A885B       x64\putty.exe
-SHA256          64557833E0A44BABC583B919E959FAA43DA0FB6D9BCE8796563AFE4382BA78C2       x64\puttygen.exe
-SHA256          00561D4083055A5903EDE95527A591555EF089EF1DEA9F1633E234831DA7DD78       x64\puttyimp.exe
-SHA256          B43D3D830CABBF79EFE38745BFFF8C9438465A7886E05289632DD36125EC4055       x64\puttytel.exe
-SHA256          DF4F73A2794B5ABDFCD94A031E546F0E771CA8CB19FBFB7A59BAE82D7B97A2A5       x86\pageant.exe
-SHA256          EB724F668B9480AD0C24ECA566B0F84143DF481FFEAEC7C186442BE76068A042       x86\plink.exe
-SHA256          46940E760C86DDACB4BB74BB7CD8768CAB8CCBC78B7A03A21ABD2E57473A2DB0       x86\pscp.exe
-SHA256          02ECD04BC96432C32FA4E7CF15FA62102132DCF65709CBCBB74EBD3CC3C4EE43       x86\psftp.exe
-SHA256          399AF4959745C71D32DE7FA252F497797E35F0BA3AD2F20B2357D08E5F078F6E       x86\pterm.exe
-SHA256          1CCC2910A70E576F141A483B756D01B35EFA4F77CC1EF4B3EFF656237E8595B1       x86\putty.exe
-SHA256          550CD8F50A30D74683E60BF8BBCBC6A3C7789EC87111AFB07882D3E9C1F59D33       x86\puttygen.exe
-SHA256          200468EFB5481FC0777E68774E93F337A2E94D3604C43E44A42B1DEF17D09FF9       x86\puttyimp.exe
-SHA256          39E4F9A0B7E39B2F15186678944EEA5A93E9BC0E904C01220ACF1F725B8142A4       x86\puttytel.exe
-SHA256          C8DF457BE4AD9D3F078BE01A6A6272A641DF57B845474B899ED5B0AD5E6AC930       puttycac-0.78u1-installer.msi
-SHA256          75F1315888F89404B3EF18A8F2E459AB0A508027DF357E007E3A29EB8C31C242       puttycac-0.78u1.zip
-SHA256          C2E35BD6619EF090C983BE644FC606B858083B5A47CF03852A843B3ECFEBC18D       puttycac-64bit-0.78u1-installer.msi
-SHA256          23A5445F9D3AE199C826B71B3B822AB30204741239FB1F8DF40AE2748DB91653       puttycac-64bit-0.78u1.zip
+SHA256          7ECB25837B73A77F9F499B3A678A178F465C3E9ED977626E4F4D8CCF1862D671       x64\pageant.exe
+SHA256          8F8CF52B97A1E12F7BE5C341B2B36AAAF633C242C028CE3FBC89562601DA21C9       x64\plink.exe
+SHA256          4EC816777E9F4663CE560C774E12A12C3527030FE6DA194D18A0A6517C5343C8       x64\pscp.exe
+SHA256          452D678ADE5A87F905318E0A349AB7FDD11C3FA23B4F0FE2731A18E1BCD1245F       x64\psftp.exe
+SHA256          149A5EB061AADF75B7620631D515AEC61ECCA1623F2A4077B752F3C97DCD7FBA       x64\pterm.exe
+SHA256          8BD28EFC5AB76CE59F351F5F465ADCC953209D4B12D8E378D715F29D3466C10C       x64\putty.exe
+SHA256          62A955FAD1EDD02D82D6EF2D546EB83DF636BBADC06129B175EE831CDCFB3498       x64\puttygen.exe
+SHA256          2BE375E0285DB3E7E99E1724E7FEF9DA27F05F8B39F1DCF3938F9C75FB1A595D       x64\puttyimp.exe
+SHA256          7AEF2277D864D7968D171EDC44156534DF8E3ADD7FE0B616DD5889D643F4E329       x64\puttytel.exe
+SHA256          6999A9F716AF727AD1B81A3FBCBBA9CA128501AABE8962CB0456391DC0478727       x86\pageant.exe
+SHA256          BA022E573F893C49312D1159791055FCC1DE9FA7BD230CA716D659D1D838DD66       x86\plink.exe
+SHA256          2418CEAEBE7A7392244FFCDA037E72F9FC986690863BD3DD2AB04A43A9A93BD6       x86\pscp.exe
+SHA256          25AF0BF568D17F50234C03FA0EB4E02488742CA0F4283502FABB831B49B01D96       x86\psftp.exe
+SHA256          40242E3222823E3D78E6F33742B5347AFE7FEDDC1B8031AC51DA562EF2D161D0       x86\pterm.exe
+SHA256          4CF9E917DDD9213EE769D474D92D0156D37BB66C4C60FA9CCA6F03A27C6FAEBB       x86\putty.exe
+SHA256          7E9CEF25B0F828D26A9550281525048B5CF9A724883E887E9124A6003211F187       x86\puttygen.exe
+SHA256          2702563B4BFD89245043020197D9516A692AD01B167B9C4F7C3F848E011E9102       x86\puttyimp.exe
+SHA256          5CA6BD2003BA1EC355A22ACB2B4B01F6DB4AC9B0727976FE4D0D2B79B61F24FF       x86\puttytel.exe
+SHA256          6A11D19193EB8E5D017C493247FE1CB324492255E8A0480BFC4558886C18AC57       puttycac-0.79-installer.msi
+SHA256          D12D57174BC59C17F06BDDD9DFDFFD1031E919F483F1D119200DD8750A4B49BF       puttycac-0.79.zip
+SHA256          874C2383DB0A0B3E4B26B99148D9AD0110BBB77111645E3D9AA787BA52BE6590       puttycac-64bit-0.79-installer.msi
+SHA256          528A9FB537C49838D93680459BB91D7795598AC662EF62CCFB4EC47F3C686089       puttycac-64bit-0.79.zip
 
 
 
 Algorithm       Hash                                                                   Path
 ---------       ----                                                                   ----
-SHA1            6B633F553D0A4A072E4BCD0D9A70B11F27E0173E                               x64\pageant.exe
-SHA1            C30660363CC33ECAD04F8BAE8465ABFAB1183C68                               x64\plink.exe
-SHA1            64031302BD1C1B213EB1B37EDB5D79B93B93F7FA                               x64\pscp.exe
-SHA1            3F7C33BCDD3BBFA177536EB3117AFCE3751D5BFE                               x64\psftp.exe
-SHA1            562876A1DF37059BAC25B3A191DCB128EA25A4B1                               x64\pterm.exe
-SHA1            CCDAB18EFAB32B3E20461C43E0FD55FC510CA6C8                               x64\putty.exe
-SHA1            892875925403002C9F26A0922DCC1351502EE694                               x64\puttygen.exe
-SHA1            EF7905FDBAD49457084BCE741345C74AFF7B8B23                               x64\puttyimp.exe
-SHA1            380CF45A3D9E7D7FC93011F34F521C24B9A1EE38                               x64\puttytel.exe
-SHA1            7FF488E651632BFE8D71AC51066D23EF8A84D99A                               x86\pageant.exe
-SHA1            FCFE60866B020A4323F10B5B762D70014B200C43                               x86\plink.exe
-SHA1            D2D4756B8DB4EC4E1B9875C599E5510B5879621D                               x86\pscp.exe
-SHA1            3EAE6842EE11EEDB1B35FB958CF937063A276D39                               x86\psftp.exe
-SHA1            EE2DAD8102A03EAF53D6B24F2D76A54FB238DF29                               x86\pterm.exe
-SHA1            3C21F564BD80FC7BAC06B2179371C92A1EBF73EA                               x86\putty.exe
-SHA1            ABC1CA3D52BC6C0348597461CB43C1688312292F                               x86\puttygen.exe
-SHA1            4D3AAA5655D95C85AC6EF6DE110F3BC8F6BD1D3C                               x86\puttyimp.exe
-SHA1            2256A94F6C6BFC7C858F07764741B20844A11754                               x86\puttytel.exe
-SHA1            BAD7C1A7DEF62F654808034D0C74ACE65D0CF765                               puttycac-0.78u1-installer.msi
-SHA1            F9C2397D32639D7B9FB83FAE1B268F2D795916C8                               puttycac-0.78u1.zip
-SHA1            5814D5308EF35A056BC2FE2ACF0AC9495144A52F                               puttycac-64bit-0.78u1-installer.msi
-SHA1            E07012AAEC96317BC277402CFAEAC6D7F0C03EF6                               puttycac-64bit-0.78u1.zip
+SHA1            3DF29227FD929E23F9FBEDE9B831ED380892FEB9                               x64\pageant.exe
+SHA1            ED9AC230317559581DDC22597156B137DAE566CE                               x64\plink.exe
+SHA1            46E7BBC3953AE92EB6331158652C2637851D35AC                               x64\pscp.exe
+SHA1            57A3900460E1CA9E8E83AF4140D36A2DC39F6FDF                               x64\psftp.exe
+SHA1            D99DC4E216CC1E6401674F46DC7B81F7D40BB3CC                               x64\pterm.exe
+SHA1            26DF7AABD714312E8FA0D08104E978CB6CA10733                               x64\putty.exe
+SHA1            F5C6F303E3E5567386FCC170CA3531A4855025D8                               x64\puttygen.exe
+SHA1            366A82861A856CCECEC6DD2C6CC3260EB99DA38A                               x64\puttyimp.exe
+SHA1            7A7F54B8CC38ED65213EEB818422CC60895B2E3B                               x64\puttytel.exe
+SHA1            C801DBB50198312869137C8A06C7D1237F1B480F                               x86\pageant.exe
+SHA1            07B1FE0351D7539610112A050CFB507B3247CC17                               x86\plink.exe
+SHA1            52647F00B73A1BD9C9501CA6352AC066F77FA719                               x86\pscp.exe
+SHA1            4B02BB575BA1546AB20C94CB179AB01E46455BD3                               x86\psftp.exe
+SHA1            94B9924730557F8512CFD91402D71CFE359AE17E                               x86\pterm.exe
+SHA1            584525008C2959E1C0842234186D6C2CC4907D69                               x86\putty.exe
+SHA1            50A7E211F164C35B35EB6A9F651A8B7DA6A7F84E                               x86\puttygen.exe
+SHA1            02E926581448AD1AB4FEE3503332D5C9FFA7C87E                               x86\puttyimp.exe
+SHA1            DA9530ED3B209FE3BA35708E75D904BB9EFF8F7A                               x86\puttytel.exe
+SHA1            3899AFDB6B0F0C959C672BF1A53404BD4E397FB7                               puttycac-0.79-installer.msi
+SHA1            BBC476CF0BB72B1C6D4F32DB670DE2B2A16E6CFE                               puttycac-0.79.zip
+SHA1            C83013711564CBB2419C6F0E8F32623E0470E3DC                               puttycac-64bit-0.79-installer.msi
+SHA1            D101C8A9D2488E139AC8A385161834AB9DBEFDA2                               puttycac-64bit-0.79.zip
 
 
 
 Algorithm       Hash                                                                   Path
 ---------       ----                                                                   ----
-MD5             6CE055801AA78A16651DF994EA7FA989                                       x64\pageant.exe
-MD5             9AA88858A1E0480FF2F8AA53939E4EF3                                       x64\plink.exe
-MD5             CC4D6265A9D7DB05B9535C0C6C482F4A                                       x64\pscp.exe
-MD5             88C393D3E45E760D23247A81FD42EA82                                       x64\psftp.exe
-MD5             635152540647A03106E5796739DA1336                                       x64\pterm.exe
-MD5             86CD921032BDE10210F7D51002645094                                       x64\putty.exe
-MD5             AAC9AADC2B5F0BCB056D14AF0092449F                                       x64\puttygen.exe
-MD5             97A404FB06A16E7DDC1F62658820DB24                                       x64\puttyimp.exe
-MD5             30782E6E49099AFF0ED0C56E70FBFFFC                                       x64\puttytel.exe
-MD5             D5F6049CFE46F5D810A88A8F15760CE1                                       x86\pageant.exe
-MD5             875E519BFB4DE85FAE1885BB62A1C2D1                                       x86\plink.exe
-MD5             127DA5975D805C4A8F73B59183A83F71                                       x86\pscp.exe
-MD5             12D14F087DC6247CDF532DD68CFFC2F1                                       x86\psftp.exe
-MD5             33372D25F64E2B2376BCAEB850907BAE                                       x86\pterm.exe
-MD5             C9488632A4B1138F5B7F7357AFC1667C                                       x86\putty.exe
-MD5             7F76007D31FFC003404066A38F80E62A                                       x86\puttygen.exe
-MD5             ECD0E9B02B632B620C02DF81CB9BF20C                                       x86\puttyimp.exe
-MD5             824DFA9ABA9BBC337E19DD57017891E6                                       x86\puttytel.exe
-MD5             651A006CD9652A674A501467C692521C                                       puttycac-0.78u1-installer.msi
-MD5             3006E967CE669779DD55BAF6415B75C9                                       puttycac-0.78u1.zip
-MD5             64F936590343214418C715A6362CC913                                       puttycac-64bit-0.78u1-installer.msi
-MD5             4EE2EEEAF6DAB69E2AB5905408C202D1                                       puttycac-64bit-0.78u1.zip
+MD5             B42C43EE616270C167216FCCD5AB3C1A                                       x64\pageant.exe
+MD5             943259D6CA1F43EC9FD4107E864F7F67                                       x64\plink.exe
+MD5             47D414E84376D792F5FB90B3F7AEA69F                                       x64\pscp.exe
+MD5             5ABDAC194DC511DF508C230F3891142F                                       x64\psftp.exe
+MD5             2ED85ACAA54B98D3087032B977BE172E                                       x64\pterm.exe
+MD5             C4BFF08219279104390F78D8C7C7645E                                       x64\putty.exe
+MD5             1AFE1BE7B086A4D6B3416CDF2C2D43ED                                       x64\puttygen.exe
+MD5             47A029AE85BF804AB70317D041A166F5                                       x64\puttyimp.exe
+MD5             4CDC0D4684E56CD8DD128F0FF849363B                                       x64\puttytel.exe
+MD5             FA155FFEF6897BAB56CAE8CEF97F7A82                                       x86\pageant.exe
+MD5             626B233FDCD5C057B673D43A0D4A18EE                                       x86\plink.exe
+MD5             FFD5F73335169F090FD8A64685E70BA8                                       x86\pscp.exe
+MD5             6ED4E45FE3EE16951743720A195DEA7A                                       x86\psftp.exe
+MD5             9A74535AA8DCA6C1E99BAF280B41C2BE                                       x86\pterm.exe
+MD5             5A90291FF850F893CF146A4D84D16A19                                       x86\putty.exe
+MD5             BCAD1E4C81A2012CC53E4A5F0B52993C                                       x86\puttygen.exe
+MD5             49A0E9E8C850FF1B50FAAA5906201EDE                                       x86\puttyimp.exe
+MD5             5568D86EC0533465CF49E9DDC98D089D                                       x86\puttytel.exe
+MD5             4FC491F22B2C5C6359616AD3F32C4DF0                                       puttycac-0.79-installer.msi
+MD5             ABD1937226978881B1A336923FDBEF45                                       puttycac-0.79.zip
+MD5             4CBA150DCA2FF1609EC248A30D2ED558                                       puttycac-64bit-0.79-installer.msi
+MD5             8C85D645193D51C056AEBA804ACD4C50                                       puttycac-64bit-0.79.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/Buildscr b/code/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 18293 # update this at every release
+set Epoch 18595 # 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
 
@@ -270,12 +270,16 @@ in putty/windows do mkdir deliver
 in putty/windows do for subdir in build32 abuild32 build64 abuild64 buildold; do mkdir deliver/$$subdir; done
 in putty/windows do while read x; do mv $$x deliver/$$x; mv $$x.map deliver/$$x.map; done < to-sign.txt
 
-in putty/windows/deliver/buildold do zip -k -j putty.zip `ls *.exe | grep -vxE '^(puttytel|pterm).exe'` ../../../docbuild/putty.chm
-in putty/windows/deliver/build32 do zip -k -j putty.zip `ls *.exe | grep -vxE '^(puttytel|pterm).exe'` ../../../docbuild/putty.chm
-in putty/windows/deliver/build64 do zip -k -j putty.zip `ls *.exe | grep -vxE '^(puttytel|pterm).exe'` ../../../docbuild/putty.chm
-in putty/windows/deliver/abuild32 do zip -k -j putty.zip `ls *.exe | grep -vxE '^(puttytel|pterm).exe'` ../../../docbuild/putty.chm
-in putty/windows/deliver/abuild64 do zip -k -j putty.zip `ls *.exe | grep -vxE '^(puttytel|pterm).exe'` ../../../docbuild/putty.chm
-in docbuild/html do zip puttydoc.zip *.html
+# Make putty.zip in each Windows directory. We add the files one by
+# one, because 'zip' exits with a success status if it managed to add
+# _at least one_ of the input files, even if another didn't exist. So
+# doing them one at a time gets us proper error reporting.
+in putty/windows/deliver/buildold do for file in *.exe ../../../../docbuild/putty.chm; do case "$$file" in puttytel.exe | pterm.exe) ;; *) zip -k -j putty.zip "$$file";; esac; done
+in putty/windows/deliver/build32 do for file in *.exe ../../../../docbuild/putty.chm; do case "$$file" in puttytel.exe | pterm.exe) ;; *) zip -k -j putty.zip "$$file";; esac; done
+in putty/windows/deliver/build64 do for file in *.exe ../../../../docbuild/putty.chm; do case "$$file" in puttytel.exe | pterm.exe) ;; *) zip -k -j putty.zip "$$file";; esac; done
+in putty/windows/deliver/abuild32 do for file in *.exe ../../../../docbuild/putty.chm; do case "$$file" in puttytel.exe | pterm.exe) ;; *) zip -k -j putty.zip "$$file";; esac; done
+in putty/windows/deliver/abuild64 do for file in *.exe ../../../../docbuild/putty.chm; do case "$$file" in puttytel.exe | pterm.exe) ;; *) zip -k -j putty.zip "$$file";; esac; done
+in docbuild/html do for file in *.html; do case "$$file" in puttytel.exe | pterm.exe) ;; *) zip puttydoc.zip "$$file";; esac; done
 
 # Deliver the actual PuTTY release directory into a subdir `putty'.
 deliver putty/windows/deliver/buildold/*.exe putty/w32old/$@

diff --git a/code/LICENCE b/code/LICENCE
@@ -1,4 +1,4 @@
-PuTTY CAC is copyright 1997-2022 Simon Tatham & Bryan Berns.
+PuTTY is copyright 1997-2023 Simon Tatham & Bryan Berns.
 
 Portions copyright Robert de Bath, Joris van Rantwijk, Delian
 Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,

diff --git a/code/cmake/cmake.h.in b/code/cmake/cmake.h.in
@@ -1,6 +1,7 @@
 #cmakedefine NO_IPV6
 #cmakedefine NO_GSSAPI
 #cmakedefine STATIC_GSSAPI
+#cmakedefine NO_SCROLLBACK_COMPRESSION
 
 #cmakedefine NO_MULTIMON
 

diff --git a/code/cmake/setup.cmake b/code/cmake/setup.cmake
@@ -15,6 +15,12 @@ set(PUTTY_FUZZING OFF
   CACHE BOOL "Build PuTTY binaries suitable for fuzzing, NOT FOR REAL USE")
 set(PUTTY_COVERAGE OFF
   CACHE BOOL "Build PuTTY binaries suitable for code coverage analysis")
+set(PUTTY_COMPRESS_SCROLLBACK ON
+  # This is always on in production versions of PuTTY, but downstreams
+  # of the code have been known to find it a better tradeoff to
+  # disable it. So there's a #ifdef in terminal.c, and a cmake option
+  # to enable that ifdef just in case it needs testing or debugging.
+  CACHE BOOL "Store terminal scrollback in compressed form")
 
 set(STRICT OFF
   CACHE BOOL "Enable extra compiler warnings and make them errors")
@@ -108,6 +114,9 @@ endif()
 if(PUTTY_FUZZING)
   add_compile_definitions(FUZZING)
 endif()
+if(NOT PUTTY_COMPRESS_SCROLLBACK)
+  set(NO_SCROLLBACK_COMPRESSION ON)
+endif()
 if(PUTTY_COVERAGE)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage -g ")
 endif()
diff --git a/code/config.c b/code/config.c
@@ -3452,7 +3452,8 @@ void setup_config_box(struct controlbox *b, bool midsession,
                          FILTER_KEY_FILES, false, "Select private key file",
                          HELPCTX(ssh_auth_privkey),
                          conf_filesel_handler, I(CONF_keyfile));
-            ctrl_filesel(s, "Certificate to use with the private key:", 'e',
+            ctrl_filesel(s, "Certificate to use with the private key "
+                         "(optional):", 'e',
                          NULL, false, "Select certificate file",
                          HELPCTX(ssh_auth_cert),
                          conf_filesel_handler, I(CONF_detached_cert));
@@ -3708,6 +3709,10 @@ void setup_config_box(struct controlbox *b, bool midsession,
 
             s = ctrl_getset(b, "Connection/SSH/More bugs", "main",
                             "Detection of known bugs in SSH servers");
+            ctrl_droplist(s, "Old RSA/SHA2 cert algorithm naming", 'l', 20,
+                          HELPCTX(ssh_bugs_rsa_sha2_cert_userauth),
+                          sshbug_handler,
+                          I(CONF_sshbug_rsa_sha2_cert_userauth));
             ctrl_droplist(s, "Requires padding on SSH-2 RSA signatures", 'p', 20,
                           HELPCTX(ssh_bugs_rsapad2),
                           sshbug_handler, I(CONF_sshbug_rsapad2));