Address Possible PIN Dialog Focus Issue

- Modified Pageant agent request to set window focus to Pageant to PIN dialog will launch and be active.
NoMoreFood · May 18, 2017 · 1e7c5cb · 1e7c5cb
1 parent 9f028fa
commit 1e7c5cb
Show file tree

Hide file tree

Showing 21 changed files with 62 additions and 54 deletions.
diff --git a/binaries/puttycac-0.69-installer.msi b/binaries/puttycac-0.69-installer.msi
diff --git a/binaries/puttycac-64bit-0.69-focusfix.zip b/binaries/puttycac-64bit-0.69-focusfix.zip
diff --git a/binaries/puttycac-64bit-0.69-installer.msi b/binaries/puttycac-64bit-0.69-installer.msi
diff --git a/binaries/puttycac-hash.txt b/binaries/puttycac-hash.txt
@@ -1,69 +1,69 @@
 
 Algorithm       Hash                                                                   Path
 ---------       ----                                                                   ----
-SHA256          8C65A1B746CA736EA9F37FBC8D2F3F68F11E4F0DAD7696D149947F0EF7FB29B9       \binaries\x64\pageant.exe
-SHA256          5C28BF01DD6DC44337C2C5CF85A752AFFCFE7A01327D445301DD35C93D652D95       \binaries\x64\plink.exe
-SHA256          F6889A348591152ACA4A3955158286ECC4F10BAEA74961FD87C5741A99659DBC       \binaries\x64\pscp.exe
-SHA256          09AB6830EA3655650DD552FF3862DBE3E0142DC53FEEEEBB3E5546AABCE9D456       \binaries\x64\psftp.exe
-SHA256          9B8F67FED1B42CB12F32A3B13EC76F01EAD356A70BA278F6F483F0CD3ADEE2A9       \binaries\x64\putty.exe
-SHA256          B58ED0815579E1287A233534EC2CA472E92FA16E59CC23614CD636385755D5A0       \binaries\x64\puttygen.exe
-SHA256          B0F80D19F6742535C6F3BB49C4BAA9FD2032A913FFA775EBCD4D053EF2A68694       \binaries\x64\puttytel.exe
-SHA256          48279F5C92EFE81500430C61DEA4E7F4DD9AF115F1969C5643E96F688C293C84       \binaries\x64\testbn.exe
-SHA256          467987328E011AC8E4AC2037D8FA6F88293717CEBFCC9F3029D633062F1C877F       \binaries\x86\pageant.exe
-SHA256          24C98689DCAF94099B0A6C3596F79510564BB059F601D57BF7996FEE0D6F24DA       \binaries\x86\plink.exe
-SHA256          100EBF0E285A0D3171CC7BE051B6D51D321ABB66D547865404411C28FFC16F5E       \binaries\x86\pscp.exe
-SHA256          91CCBFD79779F7CC63C2F90B079C7A7B3E300423E29136F4B7234821B02FEFB5       \binaries\x86\psftp.exe
-SHA256          DCD57217CFBE699D773FF41B3BDCAF8BFB99D20F74571EFAE9F08CFD7334E67E       \binaries\x86\putty.exe
-SHA256          5126069C336DDFAB4531D9B558498C93763B4CF0ED98955DB7B21D9290ACF34C       \binaries\x86\puttygen.exe
-SHA256          A93DD8E880DB5D91971785820BB861BD1848C3DC15D608798FC7166ADFDBBBB8       \binaries\x86\puttytel.exe
-SHA256          2EB8D0EA05A6457D436C3278F555E42028CFEB19BA0F7AF5C8D49747A929C771       \binaries\x86\testbn.exe
-SHA256          329119527E4C416AD6DDB49146B6B832675AD294851A31B411C315E8254EBD1E       \binaries\puttycac-0.69-installer.msi
-SHA256          99CFCDD6D99AADD0ADFDEF0784FCB22A8D4EF3B586200774267886AD6903FA09       \binaries\puttycac-64bit-0.69-installer.msi
+SHA256          56CAA4A8EC6AEE709BA0D33F0773BC5F8F762A20A0CE8599B77AB532D4E429F9       \binaries\x64\pageant.exe
+SHA256          08CEFA3244DBB72138FEBF489CA842117EF8B44B816A59D2C895359584AD5A53       \binaries\x64\plink.exe
+SHA256          0999BA44D997F1EDC90D4AE2F8A3A4F5FA80D197142D7D6621E2B602A52277E8       \binaries\x64\pscp.exe
+SHA256          06957EBA85494CA462DDE329A4C406A584F6C1006640522F8A6F4A674574DBEB       \binaries\x64\psftp.exe
+SHA256          1301FBE6E08F94338DF186E3790FC42B7679E6478DD734161404A5E4671F38A1       \binaries\x64\putty.exe
+SHA256          B730217355F7CEB11C5518FCFA8D264509ACFE9BA6D741D553DDBB265F7BCB75       \binaries\x64\puttygen.exe
+SHA256          F36225712005369C3A736F970E0E6676A8A0A3B085CEF3223A553C82A0C77295       \binaries\x64\puttytel.exe
+SHA256          426B4B44B5A2566B30A6ACF887219D4F411F1B0D51EF5BB672A75709799C08EF       \binaries\x64\testbn.exe
+SHA256          37A162DF62023B846701568FA5CFD561A83F5E706B8537B394944D280BDCF5AE       \binaries\x86\pageant.exe
+SHA256          CA582134619F5CF4108C856AF4DAF19683FE0210B9D53B94E9D62B69353FEFB2       \binaries\x86\plink.exe
+SHA256          4F97362EA7B6818290315942744B247D97AE5FF30FCD978C5E9C5D90CA55166F       \binaries\x86\pscp.exe
+SHA256          33C93D0D904C0FEA12C736FC82A5EAC7549B9032506786BD6B59199271FBE2FE       \binaries\x86\psftp.exe
+SHA256          C46B45616FB34EDD616C7DD78CC1438BCE5FA7229D2E0EE09CE7BEA76585566F       \binaries\x86\putty.exe
+SHA256          58CE233B052505780C99228B4A7339CF6335E3A90087553958B3B4910466C407       \binaries\x86\puttygen.exe
+SHA256          EF57BF9EE277D77BB8E39B5D4CD4F288AD638534512EE83EB8AC4263FB215106       \binaries\x86\puttytel.exe
+SHA256          C104ACE7B5B6E8835639F26375F99C3BF7FED0F852FAA0B6F6E6B2B6A26FC9DF       \binaries\x86\testbn.exe
+SHA256          874580C0786D8A1BA9A765D555935F6400B7657F6E49A2EF2D4070C916869146       \binaries\puttycac-0.69-installer.msi
+SHA256          8B401444CC4E56E66AB22AE325C5803751314EEBF545BB053CA97FA621C62556       \binaries\puttycac-64bit-0.69-installer.msi
 
 
 
 Algorithm       Hash                                                                   Path
 ---------       ----                                                                   ----
-SHA1            64412F82C0D7BE87A99EB8175D4D33677D118FE9                               \binaries\x64\pageant.exe
-SHA1            ED98C206B716E2EDE28F52AA72165ED7134C7AFE                               \binaries\x64\plink.exe
-SHA1            7486E6B8899B3A3D073B9EBE395A5C18EAC6AF0A                               \binaries\x64\pscp.exe
-SHA1            E86C247F9FD9D8FE19E28711F4CDEDBB08BA85F1                               \binaries\x64\psftp.exe
-SHA1            880EDC7CB996BAC3C224CC1A30FCB9304988D5E9                               \binaries\x64\putty.exe
-SHA1            4961778FE7801DB5A37DEDD5EEB219A692445FD9                               \binaries\x64\puttygen.exe
-SHA1            E49F2DA728413EB36027B24B57309C3A55BED8BF                               \binaries\x64\puttytel.exe
-SHA1            7714CBE552EA75B5211BA5DA5CAF89BDF1CE0559                               \binaries\x64\testbn.exe
-SHA1            1D2FB8A4CBDCFB95818FF57F7C6A0BD8B98E8C87                               \binaries\x86\pageant.exe
-SHA1            39EADEE9A7785455C26DBFD3CC90547BE7545595                               \binaries\x86\plink.exe
-SHA1            97E90DD5D03B04F2EFF5A81F19C21AF50533C30C                               \binaries\x86\pscp.exe
-SHA1            E6E66A23A60BC57A9D1542DC2ADA9C79BD740CED                               \binaries\x86\psftp.exe
-SHA1            83DCDF401A58062A0D3175399BD13236975AD9EB                               \binaries\x86\putty.exe
-SHA1            26395F0B73DB20101D6E968FE6C293CC57F7F030                               \binaries\x86\puttygen.exe
-SHA1            0AD6980259DA292B9E306EEA97A12DDEB9E2FC31                               \binaries\x86\puttytel.exe
-SHA1            47FF95A54E6CAC044629E5C0835D7DBB1DD7F1C5                               \binaries\x86\testbn.exe
-SHA1            B4416E3F5980F2B0B6BED42B0A513ADA311E10AE                               \binaries\puttycac-0.69-installer.msi
-SHA1            E558B4ADBD19412D1F293A7B8EB4FD2E3BBD5CF2                               \binaries\puttycac-64bit-0.69-installer.msi
+SHA1            E62C665777DD618199A7C4C8900AF478215B6406                               \binaries\x64\pageant.exe
+SHA1            0D8D6D9D93748B57349B7EF66C932E6378BD7B7B                               \binaries\x64\plink.exe
+SHA1            429077E8B20EEEBCEDC890267C24F5E592E59509                               \binaries\x64\pscp.exe
+SHA1            3722A57FFEE63AFE0E3B1B65EF9F74A30E308D28                               \binaries\x64\psftp.exe
+SHA1            0C8F3258E5F3F2A86D58774DF42E7BFF82A86ADD                               \binaries\x64\putty.exe
+SHA1            B9EF70709718AF88105A8FB588E11DB4D850A412                               \binaries\x64\puttygen.exe
+SHA1            D42C22E279925140BD40DC642A213AC708EA6CFE                               \binaries\x64\puttytel.exe
+SHA1            809BCA95BFF129D02E10141564E67203B66216AC                               \binaries\x64\testbn.exe
+SHA1            81D3D24766D504B7055376D634097C307D10C015                               \binaries\x86\pageant.exe
+SHA1            816CAB9CEEE822A59D63FA6120C4D436F0E4C82C                               \binaries\x86\plink.exe
+SHA1            2A829BD84F8767D0966EAD4D54D76F63326E9DFD                               \binaries\x86\pscp.exe
+SHA1            334CF3469EA55DEF724D6BFCFA0F18F556072097                               \binaries\x86\psftp.exe
+SHA1            028BF845DDFA138B57ECF5A0B3B5BD080A82B1CE                               \binaries\x86\putty.exe
+SHA1            89341D8783CE22C94B426E03240543A67A217377                               \binaries\x86\puttygen.exe
+SHA1            A50AA8D0D4D658AAE063BD7EFD1A8903609B63E1                               \binaries\x86\puttytel.exe
+SHA1            FD6DD500BE38341D28C6E62EAB983999EAFF4434                               \binaries\x86\testbn.exe
+SHA1            E22F09DD27459B483F90911326701B9C22483DB2                               \binaries\puttycac-0.69-installer.msi
+SHA1            96399D7EA3F3DC6F5D7BF5241442B7D8B2A4CF17                               \binaries\puttycac-64bit-0.69-installer.msi
 
 
 
 Algorithm       Hash                                                                   Path
 ---------       ----                                                                   ----
-MD5             E18EF9CAD7F188EC565E7BABA20A6B82                                       \binaries\x64\pageant.exe
-MD5             0D7B5759F09AF1B1028E56138DA58277                                       \binaries\x64\plink.exe
-MD5             C6BF5AE82312694D45C209BC2D3CC5F4                                       \binaries\x64\pscp.exe
-MD5             19C65F7A50EF859F6E86E541853C89BA                                       \binaries\x64\psftp.exe
-MD5             ED93A1ED19519B1B723D1A0A2A831EC3                                       \binaries\x64\putty.exe
-MD5             02E63790F406DD7B534D4A1C1C45D7BD                                       \binaries\x64\puttygen.exe
-MD5             851ABEDB01AC58D85987EFBEE15D330A                                       \binaries\x64\puttytel.exe
-MD5             BC59F0B47F058E5AEBC7D468D574815B                                       \binaries\x64\testbn.exe
-MD5             1A1698C5FE13258BF23F9EA93C6E4FFF                                       \binaries\x86\pageant.exe
-MD5             9E717AF0A6AD8E18DB3FBCACF9532DCD                                       \binaries\x86\plink.exe
-MD5             B4A018382B38C9F80FC21847C79BF918                                       \binaries\x86\pscp.exe
-MD5             F2F5AF876E8ADDCA5CEF4486ECB53D6C                                       \binaries\x86\psftp.exe
-MD5             0781C604BFC970D63159C23C86ACE4C7                                       \binaries\x86\putty.exe
-MD5             A90458D0E13059B24D74DC927ECA962F                                       \binaries\x86\puttygen.exe
-MD5             7A24E7BFECBF135C377779A7258ABF37                                       \binaries\x86\puttytel.exe
-MD5             89E952E212465DB29AAB992C970A5385                                       \binaries\x86\testbn.exe
-MD5             60243BF9B9334B063C346548EEBE88C9                                       \binaries\puttycac-0.69-installer.msi
-MD5             58B7C0EF685495B0C47F6EB99FFE080A                                       \binaries\puttycac-64bit-0.69-installer.msi
+MD5             8C448B85DCA578A4483A9385066FD109                                       \binaries\x64\pageant.exe
+MD5             561EDEAAACBB63E6EA56D998011812A9                                       \binaries\x64\plink.exe
+MD5             ADE7AC5E69D4EDE5367FC6AFBE720CA4                                       \binaries\x64\pscp.exe
+MD5             A3CA6DB9D52448EFBF2BECFEBBA40A49                                       \binaries\x64\psftp.exe
+MD5             0DB6BD37A62BBAA132B69AFD7DE0098C                                       \binaries\x64\putty.exe
+MD5             764F71E77DC42DA2E1641B603771238A                                       \binaries\x64\puttygen.exe
+MD5             82331CCEEEEC90B94793A1589C5C5EBB                                       \binaries\x64\puttytel.exe
+MD5             ED698BF558E756DE6491746D94C1CE5B                                       \binaries\x64\testbn.exe
+MD5             EF291CA63F85F61C6BD28B1E5F04E0CD                                       \binaries\x86\pageant.exe
+MD5             25AC27AB51A77D844F8A21FD2B526993                                       \binaries\x86\plink.exe
+MD5             6D634006AA1D1081E59A125FB3F39295                                       \binaries\x86\pscp.exe
+MD5             50035B3702C62C1795BFF4CB4C3F6F5F                                       \binaries\x86\psftp.exe
+MD5             A4B5E7367AE1F1A4D490D26920070177                                       \binaries\x86\putty.exe
+MD5             2D243A21974FB1A8D9EBA1F76F7A23F0                                       \binaries\x86\puttygen.exe
+MD5             21AD0B9B4E8854C7931C0C74C116BAD3                                       \binaries\x86\puttytel.exe
+MD5             3E62B147C2315DC2F574B590EEB1BCE2                                       \binaries\x86\testbn.exe
+MD5             F422900C5013198637B0B458ECE1282D                                       \binaries\puttycac-0.69-installer.msi
+MD5             C4528DE427ABB659D3F66F0DA2C4E9F1                                       \binaries\puttycac-64bit-0.69-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/windows/winpgntc.c b/windows/winpgntc.c
@@ -103,7 +103,15 @@ agent_pending_query *agent_query(
      * query is required to be synchronous) or CreateThread failed.
      * Either way, we need a synchronous request.
      */
+#ifdef PUTTY_CAC
+	HWND hCallingWindow = GetActiveWindow();
+	SetFocus(hwnd);
+	BringWindowToTop(hwnd);
+#endif // PUTTY_CAC
     id = SendMessage(hwnd, WM_COPYDATA, (WPARAM) NULL, (LPARAM) &cds);
+#ifdef PUTTY_CAC
+	SetFocus(hCallingWindow);
+#endif // PUTTY_CAC
     if (id > 0) {
 	retlen = 4 + GET_32BIT(p);
 	ret = snewn(retlen, unsigned char);