Addressed Pageant Key Loading Issue

Addressed issue causing standard PuTTY keys to fail to load in Pageant. Updated Binaries For 0.75u1.
NoMoreFood · May 17, 2021 · 771c4a2 · 771c4a2
1 parent 389c538
commit 771c4a2
Show file tree

Hide file tree

Showing 24 changed files with 63 additions and 63 deletions.
diff --git a/binaries/puttycac-0.75.zip b/binaries/puttycac-0.75.zip
diff --git a/binaries/puttycac-0.75-installer.msi → binaries/puttycac-0.75u1-installer.msi b/binaries/puttycac-0.75-installer.msi → binaries/puttycac-0.75u1-installer.msi
diff --git a/binaries/puttycac-0.75u1.zip b/binaries/puttycac-0.75u1.zip
diff --git a/binaries/puttycac-64bit-0.75.zip b/binaries/puttycac-64bit-0.75.zip
diff --git a/binaries/puttycac-64bit-0.75-installer.msi → binaries/puttycac-64bit-0.75u1-installer.msi b/binaries/puttycac-64bit-0.75-installer.msi → binaries/puttycac-64bit-0.75u1-installer.msi
diff --git a/binaries/puttycac-64bit-0.75u1.zip b/binaries/puttycac-64bit-0.75u1.zip
diff --git a/binaries/puttycac-hash.txt b/binaries/puttycac-hash.txt
@@ -1,69 +1,69 @@
 
 Algorithm       Hash                                                                   Path
 ---------       ----                                                                   ----
-SHA256          B287ED00913077B7FCF9177D0EEC20E64D293D5F390E29A10094EFE99AFC0ABC       x64\pageant.exe
-SHA256          044218B4D7B56E25D0C001B98640F76144F3CEEC17046BBB7556A0EE355E0F28       x64\plink.exe
-SHA256          BE3FC0568AFF37AA7D8A67BCEA532272B5B304F07D1C7EB0256CC0163BDCE0AA       x64\pscp.exe
-SHA256          4F4A0263900DB258EF278EDBFCDD7243E52AA39D464739C5559138F3DC365B04       x64\psftp.exe
-SHA256          EC7652633CA19CDC881EFC74168B5873AA07681FC30DD8B96E0A22582FA7C1F7       x64\putty.exe
-SHA256          3AB98948010FC47DD1C3FFF6529190702E2B727AC6EF47754005603193DD3E93       x64\puttygen.exe
-SHA256          184CA1026FCE628AD3E455AD7DCE4FAC76DBDB50EF852A42980D31408CA7CFC9       x64\puttytel.exe
-SHA256          FFB6F56D673384D95136A684D7E20470B4E0315CECB79A4A4FBA6B8C5DB99685       x86\pageant.exe
-SHA256          989B558D346B27CBF897869BFD4FB117FE45892A78C43E646328C02762F1AEDB       x86\plink.exe
-SHA256          59E54563D2C1E29A6916551746AA327A5E090924C0569B87067446B299A5CBD9       x86\pscp.exe
-SHA256          B74C7DFD437541E2F8F9F7851ED8DAE26D1050EDDCB0CAC9B04FDA16B1E89FBF       x86\psftp.exe
-SHA256          52B9C7C773BD59D94D93B84F5E838BC6EFEFC7D9E3AED4284D127BBB9519C38F       x86\putty.exe
-SHA256          2BD7AD09576C80813251911441FB83F0221A6D1814D5DAA44B8B33C6B3F0FBB1       x86\puttygen.exe
-SHA256          91818D4EF5649DC4F94A885D4ED7FCBD30AA345FA9EB4907DFB0BAB75002EAA5       x86\puttytel.exe
-SHA256          928A58E883008909AA38D06DC79801156F59E4E5C4D0BC51913C9E1726B1F494       puttycac-0.75-installer.msi
-SHA256          763F6E9A5E8D9B1E4A98A3E962200EBF19573E51A6AB94D63E9C71D1D1A960F8       puttycac-0.75.zip
-SHA256          BA4C1E3A9109981338208DBD61D2CA2C3C0DBE83A849DF1FFD4E5986FF06D0FA       puttycac-64bit-0.75-installer.msi
-SHA256          A0DC2A0050486FAB7321D59225A0675378E1B0BE9005D54FCD396A111CBCF239       puttycac-64bit-0.75.zip
+SHA256          72DFF5BA820B3914AAD4CDDDBA699E5557898F322188B512200386CC713BBBB1       x64\pageant.exe
+SHA256          E927F1BECE8E3A81A09AACE23A1E7609441B6341AA56970EF8C90B37BB7EE649       x64\plink.exe
+SHA256          E45F7E2262459C169197BA9904F7BE820C329451C26A5D5156DF5CD91C13AEF9       x64\pscp.exe
+SHA256          D24B8787CB8C6B0A9ED0FDC2C649AB9B469E9A70E606249DBFDBE53DD5CBBA53       x64\psftp.exe
+SHA256          4E3D2B6E95487FCAA6C33CC5CF4681D7B03AAB1870D75900C358B370A13C674D       x64\putty.exe
+SHA256          B39F76A49889AF98170D5FEFFDF7C1FAFD9D5AB98162B7A3C766966102478EBA       x64\puttygen.exe
+SHA256          2C185B58BB9FCAC87BA5C5AB7750B5A0690AE8CDFFF7FAD2B25BFE51DF983AEB       x64\puttytel.exe
+SHA256          5C1DA2260C874A76111B7578AF55F81226FD319EC8C4B6D59E65D7E2C8664C85       x86\pageant.exe
+SHA256          D6335C1C00709937FD3850E64472EB37D2A2E9A7FFB031C4495E6B7957D5680B       x86\plink.exe
+SHA256          0BE016297B09B3972123266C68535A3FB08A2C87A8C26E7024C5F2D0DCA46532       x86\pscp.exe
+SHA256          72561DFD67A3EFFBE771106BF45DC196E47FA0211F8B2C58EB9179EC61B8ED61       x86\psftp.exe
+SHA256          9CB3EA1CCCE32E26250D2DB4DCA9EBB39C057E275AB584B3700D41E7B1588322       x86\putty.exe
+SHA256          B89619F03EB7C2A819D3A45A609E51A985F24EF19A412EE013CF88C4A75EAD7F       x86\puttygen.exe
+SHA256          4D00BF06ADF99D05CAA509BAE9EA3E32AAB3509F2396FDB3F3FC78760AB345D9       x86\puttytel.exe
+SHA256          397809F0C81F8A1E8D22D658A777DD491310B5831D286C1A985712C880F3710F       puttycac-0.75u1-installer.msi
+SHA256          59FB4B1FCC983207DE5CF525666E5235E8ED64AE5BD67C13BAD215CFF0E5E3A6       puttycac-0.75u1.zip
+SHA256          F19773A5154CECED54CDCB935759C0961F317E90F61E9B2A597E74264BC88308       puttycac-64bit-0.75u1-installer.msi
+SHA256          80FEFD3B7CD3A449C6D2B04A116CBAAEBD09C1F150A128C8249140DB394349CC       puttycac-64bit-0.75u1.zip
 
 
 
 Algorithm       Hash                                                                   Path
 ---------       ----                                                                   ----
-SHA1            1AFD46C143B96535CE333EF56BD02AACDC1973C6                               x64\pageant.exe
-SHA1            503D66C4CE6C27F02A5260F03846781D1B8AFDE9                               x64\plink.exe
-SHA1            B65D3E51577E2FC93B565DBC773B747ECF9F5853                               x64\pscp.exe
-SHA1            182DA2BC5E023F4707220B02A61CA50A92CB6B17                               x64\psftp.exe
-SHA1            9107F22D15E7D4837B685C72A06A0A938A1A6EFB                               x64\putty.exe
-SHA1            BB81C995E2F60BB937EE4F4674225C35F7132719                               x64\puttygen.exe
-SHA1            B1F369604CE60AC80EDE9330CA1DD214B6EB94CB                               x64\puttytel.exe
-SHA1            9DE8A72456A0C5082564B1C97B9D856768B04AF3                               x86\pageant.exe
-SHA1            4C36DAA92652844BED6F2E7475CDC3D2317A88AA                               x86\plink.exe
-SHA1            5D084FD0E4CAD79FCE52D829E81707799D5432E3                               x86\pscp.exe
-SHA1            8CF6A054694F9472E7520AC04489F5763609E424                               x86\psftp.exe
-SHA1            78E116B789CA6E400CBAEDFCE4C43CA20C62429D                               x86\putty.exe
-SHA1            05F07284190D7DDDF7BB24149BF2B675FBD6B3AB                               x86\puttygen.exe
-SHA1            1AE53C2907C326D82DABA6352DC771492083516C                               x86\puttytel.exe
-SHA1            C9626BC6E93323AF8AC0945882D550DAC53E8D23                               puttycac-0.75-installer.msi
-SHA1            B3617EB73AF881C9A14B167F87947E36593D481C                               puttycac-0.75.zip
-SHA1            B8EAC6266FE800A78EE33AB58766B5013518A4C3                               puttycac-64bit-0.75-installer.msi
-SHA1            46B2DCA659B6A5D3C677A6FEB56324F09CF3C379                               puttycac-64bit-0.75.zip
+SHA1            2A2AFF2C639F159016B71C1C43BDEA1AA2A5417D                               x64\pageant.exe
+SHA1            C68BB7A1D0CE62C6370F119C09834B5A327988FA                               x64\plink.exe
+SHA1            EDF61A72C175C4B7447A5DFF136A3C14606C63D5                               x64\pscp.exe
+SHA1            7423E67C770A87A6D8BB2459819F160B806FA9FF                               x64\psftp.exe
+SHA1            09658BFE4DD4F6D2384DF0D2F0EB676B2F98F4AB                               x64\putty.exe
+SHA1            7BE29CE733B77B099053D472E237ADBC2AF8C2D6                               x64\puttygen.exe
+SHA1            E927B245606B8315802D1FE73DA9E87AA898BCB5                               x64\puttytel.exe
+SHA1            AFC47275503D64494D312DE1131180EFA6320AD9                               x86\pageant.exe
+SHA1            99959ADD44DA4D72A51891CDE43EECBE707A74AD                               x86\plink.exe
+SHA1            E70502106CE4F16CB311C1ED5048090C80E0ACA1                               x86\pscp.exe
+SHA1            CA73E9992AFA06469B35BC01F2EDEF89D50AFFCE                               x86\psftp.exe
+SHA1            2167E1140E46D1CA62B73AB5B7F73212B5C49078                               x86\putty.exe
+SHA1            237C45061C199C2C6CB93583E0F7D75DB883E26C                               x86\puttygen.exe
+SHA1            C4AE171B2CA5D28228793F939FDC16C2C94A0E38                               x86\puttytel.exe
+SHA1            7201DEFE64FD2152780CFBF7BB5C58BC8DAA6518                               puttycac-0.75u1-installer.msi
+SHA1            7209CA2331C4EB37DAB50597AABB2252BB9C78F0                               puttycac-0.75u1.zip
+SHA1            4C9E1FB16620CB99A092891FB6A2E994E2D2BFF9                               puttycac-64bit-0.75u1-installer.msi
+SHA1            E5345DE62C9801D3B9B9B48A9F6E4BBFEA30C28F                               puttycac-64bit-0.75u1.zip
 
 
 
 Algorithm       Hash                                                                   Path
 ---------       ----                                                                   ----
-MD5             95699C1C973DDF61F099628B660EE8B9                                       x64\pageant.exe
-MD5             CAAF983EF57576BFE47FB388BD08A80F                                       x64\plink.exe
-MD5             33AF8AA3841D16309A8872294FCE27C3                                       x64\pscp.exe
-MD5             A6C7B13DCCDBDBF013E4C0B807312898                                       x64\psftp.exe
-MD5             32CF6B1D06D2B76F95144CC60CEC0EE6                                       x64\putty.exe
-MD5             FF798BAC7EC2CC14E3EFD69A913CF3B4                                       x64\puttygen.exe
-MD5             B3259492C6307AC4CE628C682C78AC41                                       x64\puttytel.exe
-MD5             C6DE402B29698E6181411A5184C25F6E                                       x86\pageant.exe
-MD5             EA30EC11FF428B43B79DD53A5D653EE2                                       x86\plink.exe
-MD5             8206B53A36A98E2EEF4DDE1FD1C01B7A                                       x86\pscp.exe
-MD5             9E2F85ED1EAC267E6EF475B90C3409A3                                       x86\psftp.exe
-MD5             6F157623C169B3F9E3C887265514351B                                       x86\putty.exe
-MD5             665C161ADD9CA570C1124A9E385FA70F                                       x86\puttygen.exe
-MD5             08C8A6A7D081974385D2C10CA134DDAB                                       x86\puttytel.exe
-MD5             9FA2F8F86F77D8B66B7140677256B512                                       puttycac-0.75-installer.msi
-MD5             08BFA7F6BF659AF2863FC993D89F3EC0                                       puttycac-0.75.zip
-MD5             019FA9C8511F79397A88C86E37A9BD35                                       puttycac-64bit-0.75-installer.msi
-MD5             DB070091BB3121C5B550EAB1F77678A6                                       puttycac-64bit-0.75.zip
+MD5             D8810E43D99EB80DE568B71C273C1DFB                                       x64\pageant.exe
+MD5             2ABB280CEC8CFEBE46C28205087262B5                                       x64\plink.exe
+MD5             94B7C7297406C34AE8F1AF1228F42537                                       x64\pscp.exe
+MD5             82A3D0727448E15E811BF69B4DAA2651                                       x64\psftp.exe
+MD5             CE8088C96FCCE465FC42DD3DF2B2B10F                                       x64\putty.exe
+MD5             EB88A09177956E6368CAB884E9E533BD                                       x64\puttygen.exe
+MD5             C273B30C700EE570AD2A3BF8F96D5C33                                       x64\puttytel.exe
+MD5             79F29140201C832FD3C1AA1CCB29347D                                       x86\pageant.exe
+MD5             7E0868F69D3C4DEAE154E27F149C3306                                       x86\plink.exe
+MD5             CDAB543E985CB2EDFE9CCD13A43A86A7                                       x86\pscp.exe
+MD5             88EE3E1FE73D2942E421E0E6A71FA41F                                       x86\psftp.exe
+MD5             7DB4201D15617DB9A351F6FA2FDF9CDC                                       x86\putty.exe
+MD5             280D52D187C294AF7BD0D24CE1EADE41                                       x86\puttygen.exe
+MD5             0D8610AC8D0C195092A375CB795A68A9                                       x86\puttytel.exe
+MD5             17CE6E0FDDAB3A730A86777D7028213D                                       puttycac-0.75u1-installer.msi
+MD5             67928F969A1D0EF92091E1F324F6A145                                       puttycac-0.75u1.zip
+MD5             307C80F70C5EECABE5BF540FDD7BA33E                                       puttycac-64bit-0.75u1-installer.msi
+MD5             6E2FF1F2146A3D4E977A9AE47799BED8                                       puttycac-64bit-0.75u1.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/pageant.c b/code/pageant.c
@@ -936,9 +936,11 @@ static PageantAsyncOp *pageant_make_op(
                 if (key->key) ssh_key_free(key->key);
 				sfree(key);
 				key = cert_load_key(pSearch, NULL);
+                BinarySource_REWIND_TO(msg, (pSearch - msg->data - 4));
 			}
 		}
-#else
+		if (key->key == NULL)
+#endif // PUTTY_CAC
         key->key = ssh_key_new_priv_openssh(alg, msg);
 
         if (!key->key) {
@@ -953,8 +955,6 @@ static PageantAsyncOp *pageant_make_op(
             goto add2_cleanup;
         }
 
-#endif // PUTTY_CAC
-
         if (!pc->suppress_logging) {
             char *fingerprint = ssh2_fingerprint(key->key, SSH_FPTYPE_DEFAULT);
             pageant_client_log(pc, reqid, "submitted key: %s %s",

diff --git a/code/version.h b/code/version.h
@@ -1,6 +1,6 @@
 /* Generated by automated build script */
-#define RELEASE 0.75
-#define TEXTVER "Release 0.75"
-#define SSHVER "-Release-0.75"
-#define BINARY_VERSION 0,75,0,0
+#define RELEASE 0.75-1
+#define TEXTVER "Release 0.75-1"
+#define SSHVER "-Release-0.75-1"
+#define BINARY_VERSION 0,75,0,1
 #define SOURCE_COMMIT "See https://github.com/NoMoreFood/putty-cac"
diff --git a/packager/build.cmd b/packager/build.cmd
@@ -2,8 +2,8 @@
 TITLE Building PuTTY-CAC
 
 :: version information
-SET VER=0.75
-SET VERN=0.75.0.0
+SET VER=0.75u1
+SET VERN=0.75.0.1
 
 :: cert info to use for signing
 SET CERT=BC4F81C0B3B32755A8CC9A6B91713958294788F0