diff --git a/0.74_My_PuTTY/version.h b/0.74_My_PuTTY/version.h index 4153671..2ee6945 100644 --- a/0.74_My_PuTTY/version.h +++ b/0.74_My_PuTTY/version.h @@ -1,5 +1,5 @@ #define RELEASE 0.74 #define TEXTVER "Release 0.74" #define SSHVER "-Release-0.74" -#define BINARY_VERSION 0,74,0,7 +#define BINARY_VERSION 0,74,1,1 #define SOURCE_COMMIT "unavailable" diff --git a/0.74_My_PuTTY/windows/version_major.txt b/0.74_My_PuTTY/windows/version_major.txt index bdc2d0a..9ec18e1 100644 --- a/0.74_My_PuTTY/windows/version_major.txt +++ b/0.74_My_PuTTY/windows/version_major.txt @@ -1 +1 @@ -"0.74.0" +"0.74.1" diff --git a/0.74_My_PuTTY/windows/version_minor.txt b/0.74_My_PuTTY/windows/version_minor.txt index 7f8f011..d00491f 100644 --- a/0.74_My_PuTTY/windows/version_minor.txt +++ b/0.74_My_PuTTY/windows/version_minor.txt @@ -1 +1 @@ -7 +1 diff --git a/0.74_My_PuTTY/windows/window.c b/0.74_My_PuTTY/windows/window.c index a1b2913..ab8e0db 100644 --- a/0.74_My_PuTTY/windows/window.c +++ b/0.74_My_PuTTY/windows/window.c @@ -5057,10 +5057,9 @@ free(cmd); if (wParam == SIZE_MINIMIZED) { if( GetKeyState( VK_CONTROL ) & 0x8000 ) { SendMessage( hwnd, WM_COMMAND, IDM_TOTRAY, 0 ) ; return 0 ; - } - else - SetWindowText(hwnd, conf_get_bool(conf,CONF_win_name_always) ? window_name : icon_name); } + else SetWindowText(hwnd, conf_get_bool(conf,CONF_win_name_always) ? window_name : icon_name); + } #else if (wParam == SIZE_MINIMIZED) SetWindowText(hwnd, @@ -7262,7 +7261,7 @@ void set_title_internal(TermWin *tw, const char *title) { %%P: le protocole %%s: nom de la session (vide sinon) %%u: le user - %%w: la list des port forward locaux + %%w: la liste des port forward locaux Ex: %%P://%%u@%%h:%%p Ex: %%f / %%s */ @@ -7285,7 +7284,7 @@ void make_title( char * res, char * fmt, const char * title ) { case PROT_RLOGIN: strcpy(b,"rlogin"); break; case PROT_SSH: strcpy(b,"ssh"); if(port==-1) port=22 ; break; case PROT_SERIAL: strcpy(b,"serial"); break; - } + } while( (p=poss( "%%P", res)) > 0 ) { del(res,p,3); insert(res,b,p); } sprintf(b,"%d", port ) ; @@ -7293,15 +7292,14 @@ void make_title( char * res, char * fmt, const char * title ) { sprintf(b,"%ld", GetCurrentProcessId() ) ; while( (p=poss( "%%i", res)) > 0 ) { del(res,p,3); insert(res,b,p); } - while( (p=poss( "%%w", res)) > 0 ) { // forward port locaux char *key, *val; int nb=0 ; del(res,p,3) ; b[0]='\0'; for (val = conf_get_str_strs(conf, CONF_portfwd, NULL, &key); - val != NULL; - val = conf_get_str_strs(conf, CONF_portfwd, key, &key)) { + val != NULL; + val = conf_get_str_strs(conf, CONF_portfwd, key, &key)) { if ( key[0]=='L' ) { if(nb!=0) {strcat(b,"|");} strcat(b,key+1); @@ -7309,13 +7307,13 @@ void make_title( char * res, char * fmt, const char * title ) { } } insert(res,b,p) ; - } } +} static void wintw_set_title(TermWin *tw, const char *title_in) { char *buffer, fmt[256]="%s" ; char *title ; - + if( title_in==NULL ) { return ; } title = (char*)malloc(strlen(title_in)+1); strcpy(title,title_in); @@ -7337,18 +7335,22 @@ static void wintw_set_title(TermWin *tw, const char *title_in) { #endif if( GetSizeFlag() && (!IsZoomed( MainHwnd )) ) { if( strlen( title ) > 0 ) { - if( title[strlen(title)-1] == ']' ) make_title( buffer, "%s", title ) ; - else { + if( title[strlen(title)-1] == ']' ) { + make_title( buffer, "%s", title ) ; + } else { sprintf( fmt, "%%s [%dx%d]", conf_get_int(conf,CONF_height), conf_get_int(conf,CONF_width)) ; make_title( buffer, fmt, title ) ; - } } - else sprintf( buffer, "%s [%dx%d] - %s", conf_get_str(conf,CONF_host), conf_get_int(conf,CONF_height), conf_get_int(conf,CONF_width), appname ) ; + } else { + sprintf( buffer, "%s [%dx%d] - %s", conf_get_str(conf,CONF_host), conf_get_int(conf,CONF_height), conf_get_int(conf,CONF_width), appname ) ; } - else { - if( strlen( title ) > 0 ) make_title( buffer, "%s", title ) ; - else sprintf( buffer, "%s - %s", conf_get_str(conf,CONF_host), appname ) ; + } else { + if( strlen( title ) > 0 ) { + make_title( buffer, "%s", title ) ; + } else { + sprintf( buffer, "%s - %s", conf_get_str(conf,CONF_host), appname ) ; } + } if( GetProtectFlag() ) if( strstr(buffer, " (PROTECTED)")==NULL ) { strcat( buffer, " (PROTECTED)" ) ; } if( conf_get_bool(conf, CONF_alwaysontop) ) if( strstr(buffer, " (ONTOP)")==NULL ) { strcat( buffer, " (ONTOP)" ) ; } set_title_internal( tw, buffer ) ; diff --git a/0.74_My_PuTTY/windows/winpgnt.c b/0.74_My_PuTTY/windows/winpgnt.c index a3647ee..96019dc 100644 --- a/0.74_My_PuTTY/windows/winpgnt.c +++ b/0.74_My_PuTTY/windows/winpgnt.c @@ -31,6 +31,8 @@ extern int DirectoryBrowseFlag ; #include "../../kitty_crypt.h" #include "../../kitty_commun.h" + +static char pphrase[2048]=""; #endif #ifndef NO_SECURITY @@ -404,6 +406,14 @@ static void win_add_keyfile(Filename *filename) pps.passphrase = &passphrase; pps.comment = err; +#ifdef MOD_PERSO + if( strlen(pphrase)>0 ) { + passphrase=(char*)malloc(strlen(pphrase)+1); + strcpy(passphrase,pphrase); + + } + else +#endif dlgret = DialogBoxParam(hinst, MAKEINTRESOURCE(210), NULL, PassphraseProc, (LPARAM) &pps); passphrase_box = NULL; @@ -1287,6 +1297,11 @@ int WINAPI Agent_WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show } else if (!strcmp(argv[i], "-restrict-putty-acl") || !strcmp(argv[i], "-restrict_putty_acl")) { restrict_putty_acl = true; +#ifdef MOD_PERSO + } else if (!strcmp(argv[i], "-pass")) { + i++; + strcpy(pphrase,argv[i]); +#endif } else if (!strcmp(argv[i], "-c")) { /* * If we see `-c', then the rest of the diff --git a/kitty.c b/kitty.c index 14686d0..75169f5 100644 --- a/kitty.c +++ b/kitty.c @@ -3472,20 +3472,19 @@ int ShowPortfwd( HWND hwnd, Conf * conf ) { if( hLib ) { pGetExtendedTcpTable = (DWORD (WINAPI *)(PVOID,PDWORD,BOOL,ULONG,TCP_TABLE_CLASS,ULONG)) GetProcAddress(hLib, "GetExtendedTcpTable"); - } + } dwResult = pGetExtendedTcpTable(NULL, &size, 0, AF_INET, TCP_TABLE_OWNER_PID_LISTENER, 0); pTCPInfo = (MIB_TCPTABLE_OWNER_PID*)malloc(size); dwResult = pGetExtendedTcpTable(pTCPInfo, &size, 0, AF_INET, TCP_TABLE_OWNER_PID_LISTENER, 0); for (val = conf_get_str_strs(conf, CONF_portfwd, NULL, &key); - val != NULL; - val = conf_get_str_strs(conf, CONF_portfwd, key, &key)) { + val != NULL; + val = conf_get_str_strs(conf, CONF_portfwd, key, &key)) { char *p; if( key[0]=='R' ) { p = dupprintf("[-] %s \t\t<-- \t%s\n", key+1,val); - } - else if ( key[0]=='L' ) { + } else if ( key[0]=='L' ) { if( pGetExtendedTcpTable && (dwResult == NO_ERROR) ) { int found=0 ; if( pTCPInfo->dwNumEntries > 0 ) { @@ -3497,31 +3496,30 @@ int ShowPortfwd( HWND hwnd, Conf * conf ) { else p = dupprintf("[X] %s(%u)\t--> \t%s\n", key+1,(unsigned int)owner->dwOwningPid,val) ; found=1; break; - } } } } + } if( !found ) { p = dupprintf("[-] %s \t\t--> \t%s\n", key+1,val); } - } - else { + } else { p = dupprintf("[-] %s \t\t--> \t%s\n", key+1,val); - } } - else if ( key[0]=='D' ) - p = dupprintf("D%s\t\n", key+1); - else - p = dupprintf("%s\t%s\n", key, val); + } else if ( key[0]=='D' ) { + p = dupprintf("D%s\t\n", key+1) ; + } else { + p = dupprintf("%s\t%s\n", key, val) ; + } strcat( pf, p ) ; sfree(p); - } + } if( hLib ) { FreeLibrary( hLib ) ; } strcat( pf, "\n[C] Listening in the current process\n[X] Listening in another process\n[-] No Listening\n" ); MessageBox( NULL, pf, "Port forwarding", MB_OK ) ; return SetTextToClipboard( pf ) ; - } +} void SaveCurrentSetting( HWND hwnd ) { char filename[4096], buffer[4096] ;