Modified Dynamic Libary Search Behavior

- Modified library search behavior to allow loading of dependent libraries from the same directory as the explictly loaded library. This corrected a behavior where certificate enumeration would fail. - Updated version information to 0.70 Update 1.
NoMoreFood · Jul 24, 2017 · 8b4b88b · 8b4b88b
1 parent bca772a
commit 8b4b88b
Show file tree

Hide file tree

Showing 22 changed files with 67 additions and 68 deletions.
diff --git a/binaries/puttycac-0.70-installer.msi → binaries/puttycac-0.70u1-installer.msi b/binaries/puttycac-0.70-installer.msi → binaries/puttycac-0.70u1-installer.msi
diff --git a/binaries/puttycac-64bit-0.70-installer.msi → binaries/puttycac-64bit-0.70u1-installer.msi b/binaries/puttycac-64bit-0.70-installer.msi → binaries/puttycac-64bit-0.70u1-installer.msi
diff --git a/binaries/puttycac-hash.txt b/binaries/puttycac-hash.txt
@@ -1,69 +1,69 @@
 
 Algorithm       Hash                                                                   Path
 ---------       ----                                                                   ----
-SHA256          67874EEAFE2F296B99E5F2771D0EC1AA5D9EC9F5448C16459B824B1AA011EFAD       \binaries\x64\pageant.exe
-SHA256          FDE8B748B1DEFFD38AD949AE739E04DB105080873606C44F158A435E82E035C2       \binaries\x64\plink.exe
-SHA256          DBF9759F6C1D567ED98CAF0E413FFFFF533F1522499EC74084E780BD70B35E02       \binaries\x64\pscp.exe
-SHA256          CF6BFF07F6C46CE6C54F4A7F44036585AD8EB64DFDD519D83ACAB485A09799A5       \binaries\x64\psftp.exe
-SHA256          E157D3A3298E59BDD8C35BECBACA4452CB0BFA6D35B2F51CC66BB439E583C36F       \binaries\x64\putty.exe
-SHA256          1A98797CE217AE7728CBED1A1D3FD3DFA3274682E055C330CCAD4E87789F6E47       \binaries\x64\puttygen.exe
-SHA256          39BB7F61A0B369640263E7ABC489DD88C2D49F2CA30409F89DB4FFDCFB717C53       \binaries\x64\puttytel.exe
-SHA256          4C660D673BAAAAACFFF2F129EA78C65C933AF971CDF859FC5A3D57FBCFD47477       \binaries\x64\testbn.exe
-SHA256          4C2FD89858DADCBD1F5544355F36DB24E54050A233408F811240DE7D8910E69B       \binaries\x86\pageant.exe
-SHA256          6039B14FD9C6301D59FB6AAA302A529480EBD88D6E283EEF85A4DA0E4961B737       \binaries\x86\plink.exe
-SHA256          A78016B3E0235079CF585DF3C56627C1B39579CB8F4AAC18387770237524D52F       \binaries\x86\pscp.exe
-SHA256          DB2248A11FCB00E819CFB400709CF31A1305E44FE0EE3B5F5EEB5643D941B7D4       \binaries\x86\psftp.exe
-SHA256          FF4AB1ED60B357807CEDF835A0916211166E1DE428172A0A82E6087B0486C1D1       \binaries\x86\putty.exe
-SHA256          24CCD2BD73D92F54F462A5E9D86C6C0B8A9F65C24C85D36D6FA977980A6BE9CE       \binaries\x86\puttygen.exe
-SHA256          9D76B2E7516A31758BABED6059A6A58CA07F388E830C43B11544CD1B9547F680       \binaries\x86\puttytel.exe
-SHA256          F2E3846785AD5952B67931C2A41359520420D3315B93E53CC6CEF0151CE13B4A       \binaries\x86\testbn.exe
-SHA256          8752A053D43D022149B28264BFF323CE27D03CE1DB0A092D8615A0E881D2E839       \binaries\puttycac-0.70-installer.msi
-SHA256          A46420B61BB48C13B450573849F943D657FA667AD5B924C5774F8D324EFF1B0B       \binaries\puttycac-64bit-0.70-installer.msi
+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
 
 
 
 Algorithm       Hash                                                                   Path
 ---------       ----                                                                   ----
-SHA1            9B705B7FDE8E629B55F310EEFD6E882AB49464BE                               \binaries\x64\pageant.exe
-SHA1            EC6F6D0AEECD1E0950328FCFA0E481901853FB3C                               \binaries\x64\plink.exe
-SHA1            478D807D9D34C048669D6E64173219ABBF2CA3E6                               \binaries\x64\pscp.exe
-SHA1            4AD0686E400DE97B5B4B6CDD2719C8DAD8939782                               \binaries\x64\psftp.exe
-SHA1            E09CD0BA663F91320FDFFBBFCC5F0C6465A4E1F6                               \binaries\x64\putty.exe
-SHA1            3DC846287D6EE361A3668EA3B1A31AF318E0F465                               \binaries\x64\puttygen.exe
-SHA1            F34EBCB2D95B5AF8C17BF58CE995F3358239A5F8                               \binaries\x64\puttytel.exe
-SHA1            2CEEDD7C3F9B7E37D5313D8E30682EBEA4A0986F                               \binaries\x64\testbn.exe
-SHA1            5DE2252A415ED97B526A96577021FFF0174078F6                               \binaries\x86\pageant.exe
-SHA1            F10E184A4F81AE14DF1D3FDE1BE4736BA4E035CC                               \binaries\x86\plink.exe
-SHA1            0E1725BA17A661796B0762284AA08789C8A5B0A1                               \binaries\x86\pscp.exe
-SHA1            297228F501BB1B7029418FDC44CD5C7653546898                               \binaries\x86\psftp.exe
-SHA1            2408421ACBCFA2C3DAC56F18B3DA4899D6C02FC4                               \binaries\x86\putty.exe
-SHA1            8A6AA0F2542E60AB4A76A6A274C84E9DDEC9F94B                               \binaries\x86\puttygen.exe
-SHA1            C3085D5621EDAC915D2135749B49AF82FB541990                               \binaries\x86\puttytel.exe
-SHA1            BD0AE4566CA138D24FF0463E87A33FEE6A223121                               \binaries\x86\testbn.exe
-SHA1            088ECF9B617ABE507EAAD34BAC6B32B222C0FD9C                               \binaries\puttycac-0.70-installer.msi
-SHA1            6F040C265F21636059F11C237C335E849273534F                               \binaries\puttycac-64bit-0.70-installer.msi
+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
 
 
 
 Algorithm       Hash                                                                   Path
 ---------       ----                                                                   ----
-MD5             9649DC91814DEC889FD201E7CF75C67E                                       \binaries\x64\pageant.exe
-MD5             20650A049BE2DB352D5B39CDD958AEB8                                       \binaries\x64\plink.exe
-MD5             BA439CD8FD8261AE8E70920F01015C00                                       \binaries\x64\pscp.exe
-MD5             61D39E5FADC189071ABF44686ACABD7C                                       \binaries\x64\psftp.exe
-MD5             5F236C9FC643CA25FFBC68CCDC52E382                                       \binaries\x64\putty.exe
-MD5             BBA966B17F93B106A6E036F034C30BAC                                       \binaries\x64\puttygen.exe
-MD5             296D7DFE3140E9CD9A946FEC80C54EE6                                       \binaries\x64\puttytel.exe
-MD5             5424EF88956F9AD28BEF2A1DE85684EB                                       \binaries\x64\testbn.exe
-MD5             A74FF327C02EE5075169A6CA6868ABD4                                       \binaries\x86\pageant.exe
-MD5             3BF54788E980F4FE6CE29D74927E2814                                       \binaries\x86\plink.exe
-MD5             B13D2FBD977F6CEDDBCD60EA34D0AEFB                                       \binaries\x86\pscp.exe
-MD5             15150D6E5068F1DFE682525DD262EACB                                       \binaries\x86\psftp.exe
-MD5             1D7A5D729B4266571E9C7560D6F09603                                       \binaries\x86\putty.exe
-MD5             69AF6A4E7C99F0DAB186F802B8B233E9                                       \binaries\x86\puttygen.exe
-MD5             DE4E3255579370C9A03DDBC0E1EBF60C                                       \binaries\x86\puttytel.exe
-MD5             8B9A696111FBF76F4555EC3ED3129B2B                                       \binaries\x86\testbn.exe
-MD5             B111574A0E6AC938E2305C8D699C61C5                                       \binaries\puttycac-0.70-installer.msi
-MD5             EE9649F0979589D9766960ED5C61B2C9                                       \binaries\puttycac-64bit-0.70-installer.msi
+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
 
 
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.70
-SET VERN=0.70.0.0
+SET VER=0.70u1
+SET VERN=0.70.0.1
 
 :: 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
-#define TEXTVER "Release 0.70"
-#define SSHVER "PuTTY-Release-0.70"
-#define BINARY_VERSION 0,70,0,0
+#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 SOURCE_COMMIT "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef"
diff --git a/windows/winmisc.c b/windows/winmisc.c
@@ -160,12 +160,6 @@ char *get_username(void)
 
 void dll_hijacking_protection(void)
 {
-#ifdef PUTTY_CAC
-	/* Windows 7 has a bug that prevents loading of smart card libaries 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
@@ -201,9 +195,14 @@ void dll_hijacking_protection(void)
 
     if (p_SetDefaultDllDirectories) {
         /* LOAD_LIBRARY_SEARCH_SYSTEM32 and explicitly specified
-         * directories only */
-        p_SetDefaultDllDirectories(LOAD_LIBRARY_SEARCH_SYSTEM32 |
+         * directories only */ 
+#ifdef PUTTY_CAC
+        p_SetDefaultDllDirectories(LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_SYSTEM32 |
                                    LOAD_LIBRARY_SEARCH_USER_DIRS);
+#else
+		p_SetDefaultDllDirectories(LOAD_LIBRARY_SEARCH_SYSTEM32 |
+			LOAD_LIBRARY_SEARCH_USER_DIRS);
+#endif // PUTTY_CAC
     }
 }