winpgnt.c (putty-0.75) | : | winpgnt.c (putty-0.76) | ||
---|---|---|---|---|
skipping to change at line 381 | skipping to change at line 381 | |||
* tab stops is that \t aligns to the next one you haven't | * tab stops is that \t aligns to the next one you haven't | |||
* already exceeded, so I have to guess when the key type will | * already exceeded, so I have to guess when the key type will | |||
* overflow past the bit-count tab stop and leave out a tab | * overflow past the bit-count tab stop and leave out a tab | |||
* character. Urgh. | * character. Urgh. | |||
*/ | */ | |||
BinarySource src[1]; | BinarySource src[1]; | |||
BinarySource_BARE_INIT_PL(src, ptrlen_from_strbuf(key->blob)); | BinarySource_BARE_INIT_PL(src, ptrlen_from_strbuf(key->blob)); | |||
ptrlen algname = get_string(src); | ptrlen algname = get_string(src); | |||
const ssh_keyalg *alg = find_pubkey_alg_len(algname); | const ssh_keyalg *alg = find_pubkey_alg_len(algname); | |||
bool include_bit_count = (alg == &ssh_dss && alg == &ssh_rsa); | bool include_bit_count = (alg == &ssh_dss || alg == &ssh_rsa); | |||
int wordnumber = 0; | int wordnumber = 0; | |||
for (const char *p = fingerprint; *p; p++) { | for (const char *p = fingerprint; *p; p++) { | |||
char c = *p; | char c = *p; | |||
if (c == ' ') { | if (c == ' ') { | |||
if (wordnumber < 2) | if (wordnumber < 2) | |||
c = '\t'; | c = '\t'; | |||
wordnumber++; | wordnumber++; | |||
} | } | |||
if (include_bit_count || wordnumber != 1) | if (include_bit_count || wordnumber != 1) | |||
skipping to change at line 1659 | skipping to change at line 1659 | |||
SetMenuDefaultItem(systray_menu, IDM_VIEWKEYS, false); | SetMenuDefaultItem(systray_menu, IDM_VIEWKEYS, false); | |||
ShowWindow(traywindow, SW_HIDE); | ShowWindow(traywindow, SW_HIDE); | |||
wmcpc.vt = &wmcpc_vtable; | wmcpc.vt = &wmcpc_vtable; | |||
wmcpc.suppress_logging = true; | wmcpc.suppress_logging = true; | |||
pageant_register_client(&wmcpc); | pageant_register_client(&wmcpc); | |||
DWORD wm_copydata_threadid; | DWORD wm_copydata_threadid; | |||
wmct.ev_msg_ready = CreateEvent(NULL, false, false, NULL); | wmct.ev_msg_ready = CreateEvent(NULL, false, false, NULL); | |||
wmct.ev_reply_ready = CreateEvent(NULL, false, false, NULL); | wmct.ev_reply_ready = CreateEvent(NULL, false, false, NULL); | |||
CreateThread(NULL, 0, wm_copydata_threadfunc, | HANDLE hThread = CreateThread(NULL, 0, wm_copydata_threadfunc, | |||
&inst, 0, &wm_copydata_threadid); | &inst, 0, &wm_copydata_threadid); | |||
if (hThread) | ||||
CloseHandle(hThread); /* we don't need the thread handle */ | ||||
handle_add_foreign_event(wmct.ev_msg_ready, wm_copydata_got_msg, NULL); | handle_add_foreign_event(wmct.ev_msg_ready, wm_copydata_got_msg, NULL); | |||
if (show_keylist_on_startup) | if (show_keylist_on_startup) | |||
create_keylist_window(); | create_keylist_window(); | |||
/* | /* | |||
* Main message loop. | * Main message loop. | |||
*/ | */ | |||
while (true) { | while (true) { | |||
HANDLE *handles; | HANDLE *handles; | |||
End of changes. 2 change blocks. | ||||
3 lines changed or deleted | 5 lines changed or added |