Reverted Dynamic Libary Search Behavior On Windows 7

- Reverted change for library search behavior on Windows 7. On Windows 7, the change to search order caused an issue where the CoInitialize() call was failing.
NoMoreFood · Aug 4, 2017 · 9cf5a4e · 9cf5a4e
1 parent 8b4b88b
commit 9cf5a4e
Show file tree

Hide file tree

Showing 22 changed files with 68 additions and 60 deletions.
diff --git a/binaries/puttycac-0.70u1-installer.msi → binaries/puttycac-0.70u2-installer.msi b/binaries/puttycac-0.70u1-installer.msi → binaries/puttycac-0.70u2-installer.msi
diff --git a/binaries/puttycac-64bit-0.70u1-installer.msi → binaries/puttycac-64bit-0.70u2-installer.msi b/binaries/puttycac-64bit-0.70u1-installer.msi → binaries/puttycac-64bit-0.70u2-installer.msi
diff --git a/binaries/puttycac-hash.txt b/binaries/puttycac-hash.txt
@@ -1,69 +1,69 @@
 
 Algorithm       Hash                                                                   Path
 ---------       ----                                                                   ----
-SHA256          62FFC0B41418BB56D351D449A2F070F79EF35B55B702D785C1218768B6B42F8A       \binaries\x64\pageant.exe
-SHA256          244769AC8B807F0990DC091EDD096515F29E32B6B28440E668277F415CDFDC36       \binaries\x64\plink.exe
-SHA256          58CA92BD57F6D3369F0F020812A5C01E0D4829C664507C47677DE3925B8FE613       \binaries\x64\pscp.exe
-SHA256          C23382ADB9C48BC5B77C5A1AC51A5CBD4FB161185F809E5EE1C9C36E0A13205A       \binaries\x64\psftp.exe
-SHA256          07947C7C9C6DE5180F7C7EEDD81BFE4E5C7C9A3D27E2E3AC9B6AE879FB8070E5       \binaries\x64\putty.exe
-SHA256          4F4C8006927C56DBEBC176E7F8086B1F3A668D0CEB45F8F1D76B991C9A70E4D7       \binaries\x64\puttygen.exe
-SHA256          8CB56FB801616FCFE8E7EB632054DD842C9D98AFD344338055FDE2640F515B90       \binaries\x64\puttytel.exe
-SHA256          8C267E29AE2229D7CD256D0034CCB8D05A4668EE6286863CA61FDAE38B7D97BA       \binaries\x64\testbn.exe
-SHA256          FE72494615ADE760FE09E7AFCC338EEAA21457D0F0A561626B469082F2649FDD       \binaries\x86\pageant.exe
-SHA256          3B4928DF24E539754B83036099624CB7DEC8F43138879078DC2F86FB36BB62E9       \binaries\x86\plink.exe
-SHA256          A5FA7889599397E0DB66CFABFA7704A782D3A9F54F5498559FF9A0B7EC9985ED       \binaries\x86\pscp.exe
-SHA256          3FA32D1EE1918F1A297B6D35F4441E2D595AD9D4C71D7270304B160097C34ABD       \binaries\x86\psftp.exe
-SHA256          F3BF30C9962AAF3FAD4C8C23281FE896E2281A4A73DE1D328F06DFBE44582D5B       \binaries\x86\putty.exe
-SHA256          5F10A40652A8417C859476611989FF8915F5D9836A09AE5E9F501504604B5121       \binaries\x86\puttygen.exe
-SHA256          CA6CC63A6FA62080881B0D6705C7A0911617BC6FB111389A1ABE0DA9227C2266       \binaries\x86\puttytel.exe
-SHA256          FD361E8957823EB2BF708B8D832A16FE777EA9052A0D759D7E8A883181B2F10C       \binaries\x86\testbn.exe
-SHA256          AD111E886814CDB990BD8439166B7E8C5842321B564746785E73E09D4E4432BE       \binaries\puttycac-0.70u1-installer.msi
-SHA256          853C9D7C84D502672EFACCCD60EF2A73C5E8F367EE8ACB16B13F9DDF013EE16F       \binaries\puttycac-64bit-0.70u1-installer.msi
+SHA256          AAAFE1C57E52108F963F63D6CE6637A518DF5D824AB531C830733A149F02060D       \binaries\x64\pageant.exe
+SHA256          5D32938829B2C39F0B93893DC63EA848B3E7F08CE42FA7ED8995159732939865       \binaries\x64\plink.exe
+SHA256          3A42EC194B83DA7E30D351BE498DCB1A1BB6CE1A5F4F2FBB092A17F6F3A37AC7       \binaries\x64\pscp.exe
+SHA256          46F63F810E8D177C95EAAFC588AC9DE8A9F228AF0760A396F25CD6E650CACEA0       \binaries\x64\psftp.exe
+SHA256          CBFE85AC585C8836F59F7374D57A12890CBE258D361C24FA25107F1D48EFB6F3       \binaries\x64\putty.exe
+SHA256          3EA3788E0FD1CC224779FA6E6CE63A5EED033E6582B232E23E5D5112CEB6C8B1       \binaries\x64\puttygen.exe
+SHA256          3FA3A0BA45A8196FCBEA771ED5E25B247C2CD7FCC3C7B9CE333E8F5F672078BD       \binaries\x64\puttytel.exe
+SHA256          94A6FB237336670ED70BD8FBAF4C2C9580599D4AA5DAC23E4EF2392B86C88863       \binaries\x64\testbn.exe
+SHA256          6E2D058421BA8997BF42BADBB5F4655F4E5FC8DD8CD1FB24DC7CADB6FF511FAC       \binaries\x86\pageant.exe
+SHA256          041D44CB26B0E78DF944796C2DEBBD858E84C2A13D947E85AF4AB47AC152F3EA       \binaries\x86\plink.exe
+SHA256          8911017B5C95F66EDC7A14A8B0A62780625DD40591E88AE168F052D3C1C9F00E       \binaries\x86\pscp.exe
+SHA256          DF86B30CB15AA315CB6BA8A60C8C7FC26EF029BD2D9D2B9F710C4BC0B8C20FA4       \binaries\x86\psftp.exe
+SHA256          B9DD7DCF72471071D51328516CCC43A9E6CFD8E7001512C93D12C50843F1E335       \binaries\x86\putty.exe
+SHA256          C0686BEA3AF9885814C11ED382C98C07F2D27A05A558E6E26EAA2CCFF751028B       \binaries\x86\puttygen.exe
+SHA256          FB75457610A2B71F823C30D3739D5E553D27FD4135B75E0C2B6D018FF39BD596       \binaries\x86\puttytel.exe
+SHA256          4D7A787DC1ED398118A46F050414B1C785E1CDB7B240C88C7E7ADF4D277DC1D3       \binaries\x86\testbn.exe
+SHA256          D467F969CD3829F7F2F71B72BF18100F7674DD094D6808DA0FA349B37A0ADAD2       \binaries\puttycac-0.70u2-installer.msi
+SHA256          F388F1066A5CD495A2C530428ADA54605A1F79378289F649D2EFB1D96C1E9233       \binaries\puttycac-64bit-0.70u2-installer.msi
 
 
 
 Algorithm       Hash                                                                   Path
 ---------       ----                                                                   ----
-SHA1            C86C394A3652A941036FA555EA782B7F3325225F                               \binaries\x64\pageant.exe
-SHA1            80AB9672C2B06AE1C8B31F578AB5C8CA90A201B3                               \binaries\x64\plink.exe
-SHA1            43049CC876533A3BE8618176744EEE529ECF08C5                               \binaries\x64\pscp.exe
-SHA1            BF6B0B5A602A80B09EEACA3C0AB54A79ACD1EF98                               \binaries\x64\psftp.exe
-SHA1            ED57E73A95F10501DC4B48D617F5D0660711D815                               \binaries\x64\putty.exe
-SHA1            EE1AA1D40737F765D66F4C08D7B3427259CBDE1B                               \binaries\x64\puttygen.exe
-SHA1            32D368CDBB82F91705DCBD7794CAD348B156C3A7                               \binaries\x64\puttytel.exe
-SHA1            76A7513BC470269DBB902386FA013AE669D1007E                               \binaries\x64\testbn.exe
-SHA1            8CD8C72CD316B5EDD398E95DE4E446569A81606C                               \binaries\x86\pageant.exe
-SHA1            F650C2358D624FDA2CA0897640E55E2EF4A31761                               \binaries\x86\plink.exe
-SHA1            42BEFB075F64439A74BF9835FBF8C136C6EA9C1F                               \binaries\x86\pscp.exe
-SHA1            95E785C3C6CFA6C85B4813AAC51B91CA4D6CBCE7                               \binaries\x86\psftp.exe
-SHA1            CE6EB617580CB68D4DF18AF847F82F869B00F112                               \binaries\x86\putty.exe
-SHA1            5FC28D75D8B215623985D477730BA4F3CEEE227C                               \binaries\x86\puttygen.exe
-SHA1            58A660C9B1A6C404AAFF5996BE8CE28BF8689ED2                               \binaries\x86\puttytel.exe
-SHA1            24DF962E7B315FA25F0D08F55E468DE450EEF389                               \binaries\x86\testbn.exe
-SHA1            5D466D8BF7183233D304529FDE711825AAC6D292                               \binaries\puttycac-0.70u1-installer.msi
-SHA1            7D46B0430F7D100F0C9A6C1D8BEFE41DDC5D4891                               \binaries\puttycac-64bit-0.70u1-installer.msi
+SHA1            C2E6F2916B0D69307EF84A5A90AA53E89AFF9FFF                               \binaries\x64\pageant.exe
+SHA1            E1A39E68133B746BD0389FCD72F19B66A0AF39E8                               \binaries\x64\plink.exe
+SHA1            25A7BAB1DE8162335143C7791CC358618001AA5F                               \binaries\x64\pscp.exe
+SHA1            EDADD99A8C33ACB82E55059662A988DA61C5B40F                               \binaries\x64\psftp.exe
+SHA1            1EC99E41568E066BF8DAE33B6DCA93212DC5CBEF                               \binaries\x64\putty.exe
+SHA1            55B6391742FFCECD25E5181580A07B9E82DC1558                               \binaries\x64\puttygen.exe
+SHA1            17A8FAE149613FDE0C4F9B499977218B6F4F1CFF                               \binaries\x64\puttytel.exe
+SHA1            FC83AE4F08F9EA2F48C9B7E931B66A031E3B0B7C                               \binaries\x64\testbn.exe
+SHA1            220844EC2B67081897FB7AFEAF6D6169BBFA36B5                               \binaries\x86\pageant.exe
+SHA1            00902CA5961D7FE2B2F1DEB84FC3498B2F62ADEE                               \binaries\x86\plink.exe
+SHA1            319AB73A444513A0B53E87045FEA867689D2F918                               \binaries\x86\pscp.exe
+SHA1            8FCDC987E82810C06FE371A73CF7FA6F08E426A6                               \binaries\x86\psftp.exe
+SHA1            5AC1E531722937BCA4FB5F41B52678A7D71B3F2A                               \binaries\x86\putty.exe
+SHA1            2F31501F7E0D44384CE2A3A77B203954B6E54715                               \binaries\x86\puttygen.exe
+SHA1            64B2CD2F1246E63ACBC7BE1B733D939F2AEC9414                               \binaries\x86\puttytel.exe
+SHA1            FB62DC7FB5E14A07817466AC6290A4E271445A13                               \binaries\x86\testbn.exe
+SHA1            943B9B0D437A00DD505964A66FAF81EDAF36C514                               \binaries\puttycac-0.70u2-installer.msi
+SHA1            DF55BE2E6FD3FF37F40C005D03D08950C00B0889                               \binaries\puttycac-64bit-0.70u2-installer.msi
 
 
 
 Algorithm       Hash                                                                   Path
 ---------       ----                                                                   ----
-MD5             095B5C2F98DEB0475E692034828EE63A                                       \binaries\x64\pageant.exe
-MD5             CDB68A18B16990359B103E747D599C73                                       \binaries\x64\plink.exe
-MD5             D19AB1A01351CFF44FBD2BABD2C22CE0                                       \binaries\x64\pscp.exe
-MD5             4FA914B00ECDFCDE25ED4A51015C248B                                       \binaries\x64\psftp.exe
-MD5             A66DA4EF9A064ABA3ACABDD390652172                                       \binaries\x64\putty.exe
-MD5             436C4E84F3C7761CE62405F090503017                                       \binaries\x64\puttygen.exe
-MD5             80685D473FE72DDB94230FAFC68F0B74                                       \binaries\x64\puttytel.exe
-MD5             B921BDD9E8F56C1D9C9A092DA29F72F3                                       \binaries\x64\testbn.exe
-MD5             9B4DD7EC986E8739636F97FEABC90D94                                       \binaries\x86\pageant.exe
-MD5             7E2CE04B2587B1011A36138B36DC6E7D                                       \binaries\x86\plink.exe
-MD5             5249D32B8D1CCB792968C5BC6FDB6B65                                       \binaries\x86\pscp.exe
-MD5             22B2DA7808EF91E694E183E6D689424B                                       \binaries\x86\psftp.exe
-MD5             D338DC56E4E2F4E14BE58653D31CB324                                       \binaries\x86\putty.exe
-MD5             AB65A77B7753928BA070682686F0CF0C                                       \binaries\x86\puttygen.exe
-MD5             B92116A4C17176BB6AC04DFB0EB701BA                                       \binaries\x86\puttytel.exe
-MD5             6D8A4D274BFDE98823E9F109AABCEB95                                       \binaries\x86\testbn.exe
-MD5             0932D8B1D52E04CA9BF4B0DCD2865C3F                                       \binaries\puttycac-0.70u1-installer.msi
-MD5             D74344AC07C2B4F55DC92C60B6FE8151                                       \binaries\puttycac-64bit-0.70u1-installer.msi
+MD5             816E1A5D89B5B208101A6BE4D2071431                                       \binaries\x64\pageant.exe
+MD5             045C5B9F616FB2DA3D18A39C77761BBA                                       \binaries\x64\plink.exe
+MD5             31499323CC6CA3639EEF1D4096AE1195                                       \binaries\x64\pscp.exe
+MD5             782D3632C318E0EE53040CCE19BD7F92                                       \binaries\x64\psftp.exe
+MD5             6A0FBA0C97D5833B1AE7F0264BEA86A0                                       \binaries\x64\putty.exe
+MD5             243516BCAC6E80C3F2EBA87C974B41CF                                       \binaries\x64\puttygen.exe
+MD5             B51C2F5BE845E90F535A4C4708D9CEC0                                       \binaries\x64\puttytel.exe
+MD5             DFD104FEAD4BAE63463D66578AFC0B59                                       \binaries\x64\testbn.exe
+MD5             ED8EA2B6D7523C0F8152999970284DF0                                       \binaries\x86\pageant.exe
+MD5             B1541C68EE09EDE833C05E226240A853                                       \binaries\x86\plink.exe
+MD5             50E5453AAF40BD6780988961FCB7B0B3                                       \binaries\x86\pscp.exe
+MD5             BB084EB6968688EE30AC085E9A460EA7                                       \binaries\x86\psftp.exe
+MD5             F9F8F6A33ED1809FCF04D7AC29DB6452                                       \binaries\x86\putty.exe
+MD5             259EC3EC50F70D78C011A18D3FB6A5E9                                       \binaries\x86\puttygen.exe
+MD5             F412103B783ABA8A60236547B619BB53                                       \binaries\x86\puttytel.exe
+MD5             39752B9C86E45334A4C70F03B6AEE0FE                                       \binaries\x86\testbn.exe
+MD5             51E39D90B16B6FECB66304AD5B00791F                                       \binaries\puttycac-0.70u2-installer.msi
+MD5             4FF60C251E8951E2412A7D9124860ACF                                       \binaries\puttycac-64bit-0.70u2-installer.msi
 
 
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/x64/testbn.exe b/binaries/x64/testbn.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/binaries/x86/testbn.exe b/binaries/x86/testbn.exe
diff --git a/packager/build.cmd b/packager/build.cmd
@@ -1,8 +1,8 @@
 @ECHO OFF
 
 :: version information
-SET VER=0.70u1
-SET VERN=0.70.0.1
+SET VER=0.70u2
+SET VERN=0.70.0.2
 
 :: cert info to use for signing
 SET CERT=9CC90E20ABF21CDEF09EE4C467A79FD454140C5A

diff --git a/version.h b/version.h
@@ -1,6 +1,6 @@
 /* Generated by automated build script */
-#define RELEASE 0.70-1
-#define TEXTVER "Release 0.70-1"
-#define SSHVER "PuTTY-Release-0.70-1"
-#define BINARY_VERSION 0,70,0,1
+#define RELEASE 0.70-2
+#define TEXTVER "Release 0.70-2"
+#define SSHVER "PuTTY-Release-0.70-2"
+#define BINARY_VERSION 0,70,0,2
 #define SOURCE_COMMIT "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"
diff --git a/windows/winmisc.c b/windows/winmisc.c
@@ -160,6 +160,14 @@ char *get_username(void)
 
 void dll_hijacking_protection(void)
 {
+#ifdef PUTTY_CAC
+    /*
+	 * Windows 7 has a bug that prevents loading of smart card
+	 * credential providers if a non-default search order is used
+	 */
+	if (!IsWindows8OrGreater()) return;
+#endif // PUTTY_CAC
+
     /*
      * If the OS provides it, call SetDefaultDllDirectories() to
      * prevent DLLs from being loaded from the directory containing