Early Modify Of Public Key Hash Flag - Revisions

- Added hash check at signature time as well to address interoperability with some applications that use Pageant.
NoMoreFood · Dec 22, 2021 · c13e168 · c13e168
1 parent 29ba4c0
commit c13e168
Show file tree

Hide file tree

Showing 20 changed files with 56 additions and 56 deletions.
diff --git a/binaries/puttycac-0.76u2-installer.msi b/binaries/puttycac-0.76u2-installer.msi
diff --git a/binaries/puttycac-0.76u2.zip b/binaries/puttycac-0.76u2.zip
diff --git a/binaries/puttycac-64bit-0.76u2-installer.msi b/binaries/puttycac-64bit-0.76u2-installer.msi
diff --git a/binaries/puttycac-64bit-0.76u2.zip b/binaries/puttycac-64bit-0.76u2.zip
diff --git a/binaries/puttycac-hash.txt b/binaries/puttycac-hash.txt
@@ -1,69 +1,69 @@
 
 Algorithm       Hash                                                                   Path
 ---------       ----                                                                   ----
-SHA256          1A3FE36DFA30A7CBE8FF6DC7A921D09B823561699BADC293CF528C95881D0712       x64\pageant.exe
-SHA256          DC167B036E2C01923FA837AED1834A842D6F9ABD6ABA1308BF521CA76F416643       x64\plink.exe
-SHA256          7FDB084F316CAD2FA7C5A77FAD8AB91A8FE32BAC77B79A100379803D95B9EF61       x64\pscp.exe
-SHA256          D092121D8169DF3CDE4C54C061E2D2FB5EAFE8C03910E64F23870F1A50B67839       x64\psftp.exe
-SHA256          D60AEFA8F24669E1759690473B4B00EB4A9DF04AA73ED9D9848276FF4096CF8B       x64\putty.exe
-SHA256          F2DB3F7F0498260EC4CD1E6B29E537C9148A4B7042CE6480B90766D13EADD32E       x64\puttygen.exe
-SHA256          2BFA728650FF16C653D775981412FB4B8258BB695D63717CD26BFB8027F7C377       x64\puttytel.exe
-SHA256          4590C0A5A98F067C90BCE0832DBF1E6E17F0C0640ADF911213DE8928CAA29F82       x86\pageant.exe
-SHA256          508C809D111DB72DD9FDEA5DB61BA23E86EFCBE30EC240B95832D7BA0A321FA6       x86\plink.exe
-SHA256          0AC460AB1D3F1DB163C4F0FAC066C9E0256784813760AE844F369F05ACE42204       x86\pscp.exe
-SHA256          31FA0BCD4C6DE7CD2D906DB994FCF823D2DA184579E6EBD9C7670E552762B957       x86\psftp.exe
-SHA256          74F022AA83DAD1041E903293D876B0F6F0865F8D3CC07713AD416860C6F95C33       x86\putty.exe
-SHA256          5B9A63CE1E94557943C74FB5EA26468BFA1C6D66D667953EFBAD2E14F3D2D832       x86\puttygen.exe
-SHA256          214219FD02D6633B0948748210727FC9DA83FCB969E723AB75B38B4B3B650ABF       x86\puttytel.exe
-SHA256          57BE652BD94301864E5D8E41C44787D21A477C8F486ABACEEB8D6F44AB73D400       puttycac-0.76u2-installer.msi
-SHA256          AFC427CEAA7224C82F88B857E1785584AB620A39765B8A65B0188CAA22756CC6       puttycac-0.76u2.zip
-SHA256          F413B058652C9660E35A455E1C440FCBEC059D8E42774F6FF7A2137E339ECE14       puttycac-64bit-0.76u2-installer.msi
-SHA256          80D0868F2EFDCB75788C7C4C410DEB8DBE99D4E70472F4AA551AF1D905A9FACF       puttycac-64bit-0.76u2.zip
+SHA256          58F4103543961F2E017BD62A679C3522D30B67F95C2CC6644BDF52FCCAC56A99       x64\pageant.exe
+SHA256          AB09292537B7A4F3DED1CB187BD32D83D9BA3B0249A392375E2C4ABBAC32DF1C       x64\plink.exe
+SHA256          16BFB507938C184BD8027A6B2B8F04DC3908708A992C50DB6C36183848C956C9       x64\pscp.exe
+SHA256          B4BDACD8EB4786412BF9C8D34BD46931BFE2A36FD7A49C0CEAA4633AC8B88388       x64\psftp.exe
+SHA256          12DE8267DE04B85AB951C05B8B54D80E67B6612FC096A6C33ACDF7E9D5143E5F       x64\putty.exe
+SHA256          894E80D06F90F17F10002024083F44153BAE350CF0B8A7B41281EC9F12B4300A       x64\puttygen.exe
+SHA256          66355F195B5267738755054F22C6EF7C0254253AB8BE2C27E33169E3CFB49D09       x64\puttytel.exe
+SHA256          BDC803DA4C82EF5E59B9C2149C635AFE9FCA9332FF67170C47DFCB0DC8B69EE3       x86\pageant.exe
+SHA256          A8C36FE7750907E81DD18C77CA62D5167F01C2719D180C515173C22C3E1A2475       x86\plink.exe
+SHA256          62F1392D540221B08A2C0F158367C8501084172898B5BE4A95DAA2D86FAE73A1       x86\pscp.exe
+SHA256          48BC15D72918B9DF7B8F3F563365A75BCDED35F801806564C884A89934842EB5       x86\psftp.exe
+SHA256          8B473F78B1903C232FB467D0BEFA078CD167436400CD03938D9730BD0709C8BD       x86\putty.exe
+SHA256          27EAADD7B45FB6F7E2ADB4DA38FE3C9C6B4C33050BA3F582A8F331F56B638B62       x86\puttygen.exe
+SHA256          221AC6A655F04B678CC4A8AC701A80EB6CAF2AA9791970BD43DFB8EBBFEC4E10       x86\puttytel.exe
+SHA256          D626CDC8AFD44B491B579B4C15F39647024F8CF02274738F1E6F3A0B8133EE9D       puttycac-0.76u2-installer.msi
+SHA256          BA819F1295622BC6CFE81B28D820007D9441992F42FB64E272988A640EAAA797       puttycac-0.76u2.zip
+SHA256          B586C90D9059563CACA421BA8A0E1B86AC4A79FE985181179AB616A1EDE63C29       puttycac-64bit-0.76u2-installer.msi
+SHA256          8CD808CA1DCEAC6466BB6CCC867DEB63A03E6EB6A242A7E707FF650F6DE7B909       puttycac-64bit-0.76u2.zip
 
 
 
 Algorithm       Hash                                                                   Path
 ---------       ----                                                                   ----
-SHA1            B5577858B4C47CD375F20B1DBE15FB2D3A17BD93                               x64\pageant.exe
-SHA1            4065351832A422143793CF06D5A4A0567EBAE3AA                               x64\plink.exe
-SHA1            45C54FB3408E0E2361D4472F1E2F91FFB8FD4522                               x64\pscp.exe
-SHA1            C942631420AE005C73DA76E06F860C09FD0CB0E6                               x64\psftp.exe
-SHA1            4D7F25F0D2C031C49F2D519A4832181396AFD194                               x64\putty.exe
-SHA1            F4215D0645982C80BBDDFF5B8DFA2DB0300A1CFD                               x64\puttygen.exe
-SHA1            2F4882D67798C115C4D9D473C3B1433D65377E60                               x64\puttytel.exe
-SHA1            D48A84059F1F9340B79CCFEB461B20852D78ADCF                               x86\pageant.exe
-SHA1            E06235E22B6FEEC619ACC9A8DC22CB9427FD6B3C                               x86\plink.exe
-SHA1            6C6CCA493B031986EBFEEDAADF59D378C426DE28                               x86\pscp.exe
-SHA1            90AF807A76C5401B46E0729320958B30E6AE0E52                               x86\psftp.exe
-SHA1            15A4496254F585D795E2B99DE01DD6FC2A5FEEC7                               x86\putty.exe
-SHA1            11DC39D4A7BE4414E2A9D5589EF5C15F8B8B1538                               x86\puttygen.exe
-SHA1            F722E10320CEF517B3D1BCAF4FC8C67CA46DCD40                               x86\puttytel.exe
-SHA1            46D7356A552DCA1A3FC6ACF9592789D429CEB840                               puttycac-0.76u2-installer.msi
-SHA1            F7148010F0893004C0011A808E36B6F09C32628D                               puttycac-0.76u2.zip
-SHA1            72B1B7F5C016BFD17BCD23683AAC00DFCB2C89E4                               puttycac-64bit-0.76u2-installer.msi
-SHA1            507FC62EDA9DA368BC5B694D87B955A1D9F5695D                               puttycac-64bit-0.76u2.zip
+SHA1            E8A596F9B346038031471CADEF91A528F5D74987                               x64\pageant.exe
+SHA1            852DFFB91580AD98B5BD4957FA128B629D71945C                               x64\plink.exe
+SHA1            924D67BA841B442661B4B7681B1DA3775BA5B903                               x64\pscp.exe
+SHA1            2BACDBE77CDDEBF9390D6A611A5BD97310879E8B                               x64\psftp.exe
+SHA1            599E91A2594BD6CBAAC980D347EA88A5ABB3DFD7                               x64\putty.exe
+SHA1            B967BA1B437845F342BF2E91A437643241B92248                               x64\puttygen.exe
+SHA1            1B0B7CAF736056E34A63E1CF2F2B2DE392B5699C                               x64\puttytel.exe
+SHA1            65E5D4DF01F6250BE421DF31DAF46BB0946FCE24                               x86\pageant.exe
+SHA1            D31F01EEB8E5FF42860F0D8E74605D17284B938D                               x86\plink.exe
+SHA1            41B08BFF59FE532A4F949DCC3BCF5EFE488F42CB                               x86\pscp.exe
+SHA1            43F29825A8158BF96DE11D4A8EBEDFC338077990                               x86\psftp.exe
+SHA1            481F9B58AE3C1144DE5288ACF86890469968267C                               x86\putty.exe
+SHA1            886DBB9E00D59BEDC4E18A4BAA518CC5174B3454                               x86\puttygen.exe
+SHA1            50F2385DE59EC099DC7D9B5DFEDDF020B805A8C4                               x86\puttytel.exe
+SHA1            7663A6E63BF86BCA97048F61345C0BB4B6FA5B24                               puttycac-0.76u2-installer.msi
+SHA1            9FD516C046BDE538BE9E78FB9A4E7E2F86259A20                               puttycac-0.76u2.zip
+SHA1            F92AFC23F6B69387FB7E7C6B32A96A4AA866DF2C                               puttycac-64bit-0.76u2-installer.msi
+SHA1            8B8B6F84E3F84BA96597B4B4BD20A8A545FB1DDA                               puttycac-64bit-0.76u2.zip
 
 
 
 Algorithm       Hash                                                                   Path
 ---------       ----                                                                   ----
-MD5             6A721D8EE53EE8695B87A07497023E66                                       x64\pageant.exe
-MD5             A4035F466F73AD4EA09F025CF05BFB0F                                       x64\plink.exe
-MD5             D5C995175867DAD44457C7DC4D44F051                                       x64\pscp.exe
-MD5             8B70BF99DDFC526521B7D747DD7361F0                                       x64\psftp.exe
-MD5             0321100653EE1E413BFA2A6BD0EE98BA                                       x64\putty.exe
-MD5             CD7C5F93E55F5863F650200C5DC216E8                                       x64\puttygen.exe
-MD5             F9FFB1D7935414422788D862192CC273                                       x64\puttytel.exe
-MD5             D304060929D5058BBEF19B88DF40CDAC                                       x86\pageant.exe
-MD5             684685F8D92C4039C4E282076EC74A2D                                       x86\plink.exe
-MD5             23AB83329FB14C06E1C22D937668EA04                                       x86\pscp.exe
-MD5             22A7C0825F386783890E869F06346FC5                                       x86\psftp.exe
-MD5             DE45BC3255CA6B459EEC96A36E04E626                                       x86\putty.exe
-MD5             59A2D0B77988608216BFCEBBF6AD7908                                       x86\puttygen.exe
-MD5             C511F2E4019CE33E12B2BB887538D6A0                                       x86\puttytel.exe
-MD5             62A809ABA6AA561A4E3ED5254800F60F                                       puttycac-0.76u2-installer.msi
-MD5             FD2CF3F4022F37A3AF7068C47942AD1A                                       puttycac-0.76u2.zip
-MD5             3DA5297A50491192A3AC6A8650C30BBF                                       puttycac-64bit-0.76u2-installer.msi
-MD5             771C497E4D7B66523F848F30AC76FDC7                                       puttycac-64bit-0.76u2.zip
+MD5             9845A9EF9716D1FFE3CEC1016C62DA25                                       x64\pageant.exe
+MD5             06390005E92734DFCDAD4555DB325B1A                                       x64\plink.exe
+MD5             D721D29B0DBCCB7AB63AA961DF6F89D9                                       x64\pscp.exe
+MD5             60E5A2CAEAD64330E127FCC866092149                                       x64\psftp.exe
+MD5             350A1F8DCB88C24A78C9E37807E3E439                                       x64\putty.exe
+MD5             B122BA440AAB1AEFF0551DEDBE91984E                                       x64\puttygen.exe
+MD5             DC81440314B5C87DBC5EE46FA9EECB82                                       x64\puttytel.exe
+MD5             FD3943236F65CF3DCFE1B9F3F16A8E2F                                       x86\pageant.exe
+MD5             CF3D02DD9081B0A1851EB6BCCECE2E1F                                       x86\plink.exe
+MD5             26F44115A29C98B13559B8EB614C6298                                       x86\pscp.exe
+MD5             BE917FC0B5CA75B69CC3AF0FBCE77CC4                                       x86\psftp.exe
+MD5             B51CD082C1828E76D40D3BD975263846                                       x86\putty.exe
+MD5             AA70E89CD6EF40917BCF6EC1CD634ADA                                       x86\puttygen.exe
+MD5             D5E9E7A1F549FA978FC8C3AD58A3F9CD                                       x86\puttytel.exe
+MD5             E82325AAB79AF1CB76752C83BFEDA532                                       puttycac-0.76u2-installer.msi
+MD5             0B62D02468C37DA3D381640855A48D7E                                       puttycac-0.76u2.zip
+MD5             A36B4E319C0AB32BF7CB22B482A91A4F                                       puttycac-64bit-0.76u2-installer.msi
+MD5             53162899579B752D6A9FF3EFD18181C3                                       puttycac-64bit-0.76u2.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
diff --git a/code/cert/cert_common.c b/code/cert/cert_common.c
@@ -188,10 +188,10 @@ LPBYTE cert_sign(struct ssh2_userkey * userkey, LPCBYTE pDataToSign, int iDataTo
 
 	// determine hashing algorithm for signing
 	LPCSTR sHashAlgName = userkey->key->vt->ssh_id;
-	if (strstr(userkey->key->vt->ssh_id, "ssh-rsa") && (iAgentFlags & SSH_AGENT_RSA_SHA2_256)) {
+	if (strstr(userkey->key->vt->ssh_id, "ssh-rsa") && (iAgentFlags & SSH_AGENT_RSA_SHA2_256) && cert_test_hash(userkey->comment, SSH_AGENT_RSA_SHA2_256)) {
 		sHashAlgName = "rsa-sha2-256";
 	}
-	if (strstr(userkey->key->vt->ssh_id, "ssh-rsa") && (iAgentFlags & SSH_AGENT_RSA_SHA2_512)) {
+	if (strstr(userkey->key->vt->ssh_id, "ssh-rsa") && (iAgentFlags & SSH_AGENT_RSA_SHA2_512) && cert_test_hash(userkey->comment, SSH_AGENT_RSA_SHA2_512)) {
 		sHashAlgName = "rsa-sha2-512";
 	}