From 34e6289dd992ecb9546fb353410efffa4b17b46f Mon Sep 17 00:00:00 2001 From: cyd01 Date: Sat, 1 Jan 2022 20:17:20 +0100 Subject: [PATCH] Tagging the 0.76.0.6 release of the KiTTY project. --- 0.76_My_PuTTY/licence.h | 4 +- 0.76_My_PuTTY/pageant.c | 62 +++++++++++++++--------- 0.76_My_PuTTY/version.h | 2 +- 0.76_My_PuTTY/windows/version.rc2 | 2 +- 0.76_My_PuTTY/windows/version_minor.txt | 2 +- 0.76_My_PuTTY/windows/win_res.rc2 | 2 +- 0.76_My_PuTTY/windows/windlg.c | 2 +- blocnote/notepad.a | Bin 32498 -> 32498 bytes blocnote/notepad.rc | 2 +- docs/version.txt | 2 +- kitty_launcher.c | 2 +- 11 files changed, 50 insertions(+), 32 deletions(-) diff --git a/0.76_My_PuTTY/licence.h b/0.76_My_PuTTY/licence.h index 9b9335b..3b2520b 100644 --- a/0.76_My_PuTTY/licence.h +++ b/0.76_My_PuTTY/licence.h @@ -6,7 +6,7 @@ */ #define LICENCE_TEXT(parsep) \ - "PuTTY is copyright 1997-2021 Simon Tatham." \ + "PuTTY is copyright 1997-2022 Simon Tatham." \ parsep \ "Portions copyright Robert de Bath, Joris van Rantwijk, Delian Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry, Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, Markus Kuhn, Colin Watson, Christopher Staite, Lorenz Diener, Christian Brabandt, Jeff Smith, Pavel Kryukov, Maxim Kuznetsov, Svyatoslav Kuzmich, Nico Williams, Viktor Dukhovni, Josh Dersch, Lars Brinkhoff, and CORE SDI S.A." \ parsep \ @@ -16,4 +16,4 @@ parsep \ "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE." -#define SHORT_COPYRIGHT_DETAILS "1997-2021 Simon Tatham" +#define SHORT_COPYRIGHT_DETAILS "1997-2022 Simon Tatham" diff --git a/0.76_My_PuTTY/pageant.c b/0.76_My_PuTTY/pageant.c index f685ce6..79b9986 100644 --- a/0.76_My_PuTTY/pageant.c +++ b/0.76_My_PuTTY/pageant.c @@ -375,23 +375,25 @@ static int confirm_key_usage(char* fingerprint, char* comment) { const char* title = "Confirm SSH Key usage"; char* message = NULL; int result = IDYES; // successful result is the default - - message = dupprintf("Allow authentication with key with fingerprint\n%s\ncomment: %s", fingerprint, comment); - if(comment!=NULL) if( ( GetAskConfirmationFlag()==1 ) - || - ( (GetAskConfirmationFlag()==2) && ( - (NULL != strstr(comment, "needs confirm"))||(NULL != strstr(comment, "need confirm"))||(NULL != strstr(comment, "confirmation")) - ) - ) ) { - result = MessageBox(NULL, message, title, MB_ICONQUESTION | MB_YESNO | MB_SYSTEMMODAL); + if(comment!=NULL) { + if( ( GetAskConfirmationFlag()==1 ) + || + ( (GetAskConfirmationFlag()==2) && ( + (NULL != strstr(comment, "needs confirm"))||(NULL != strstr(comment, "need confirm"))||(NULL != strstr(comment, "confirmation")) + ) + ) ) { + message = dupprintf("Allow authentication with key with fingerprint\n%s\ncomment: %s", fingerprint, comment); + result = MessageBox(NULL, message, title, MB_ICONQUESTION | MB_YESNO | MB_SYSTEMMODAL); + } } if (result != IDYES) { - sfree(message); + if(message!=NULL) sfree(message); return 0; } else { + message = dupprintf("Allow authentication with key with fingerprint\n%s\ncomment: %s", fingerprint, comment); if( GetShowBalloonOnKeyUsage()==1 ) ShowBalloonTip( trayIcone, "SSH private key usage", message ) ; - sfree(message); + if(message!=NULL) sfree(message); return 1; } } @@ -909,18 +911,26 @@ static PageantAsyncOp *pageant_make_op( goto responded; } #ifdef MOD_PERSO +void debug_log( const char *fmt, ... ) { + char filename[4096]="" ; + va_list ap; + FILE *fp ; + strcpy(filename,"kitty.log"); + + va_start( ap, fmt ) ; + //vfprintf( stdout, fmt, ap ) ; // Ecriture a l'ecran + if( ( fp = fopen( filename, "ab" ) ) != NULL ) { + vfprintf( fp, fmt, ap ) ; // ecriture dans un fichier + fclose( fp ) ; + } + + va_end( ap ) ; +} + char* confirm_fingerprint; confirm_fingerprint = ssh2_fingerprint_blob(keyblob, SSH_FPTYPE_DEFAULT); if( confirm_fingerprint!=NULL ) { - if( pk->rkey->comment != NULL ) { - if (! confirm_key_usage( confirm_fingerprint, pk->rkey->comment)) { - if( confirm_fingerprint!=NULL ) sfree(confirm_fingerprint); - fail("unconfirmed key"); - pk=NULL; - goto responded; - //return NULL; - } - } else if( pk->comment != NULL ) { + if( pk->comment != NULL ) { if (! confirm_key_usage( confirm_fingerprint, pk->comment)) { if( confirm_fingerprint!=NULL ) sfree(confirm_fingerprint); fail("unconfirmed key"); @@ -928,9 +938,17 @@ static PageantAsyncOp *pageant_make_op( goto responded; //return NULL; } - } - if( confirm_fingerprint!=NULL ) sfree(confirm_fingerprint); + } /*else if( pk->rkey->comment != NULL ) { + if (! confirm_key_usage( confirm_fingerprint, pk->rkey->comment)) { + if( confirm_fingerprint!=NULL ) sfree(confirm_fingerprint); + fail("unconfirmed key"); + pk=NULL; + goto responded; + //return NULL; + } + }*/ } + if( confirm_fingerprint!=NULL ) sfree(confirm_fingerprint); #endif if (have_flags) diff --git a/0.76_My_PuTTY/version.h b/0.76_My_PuTTY/version.h index 52377b4..95d014c 100644 --- a/0.76_My_PuTTY/version.h +++ b/0.76_My_PuTTY/version.h @@ -1,5 +1,5 @@ #define RELEASE 0.76 #define TEXTVER "Release 0.76" #define SSHVER "-Release-0.76" -#define BINARY_VERSION 0,76,0,5 +#define BINARY_VERSION 0,76,0,6 #define SOURCE_COMMIT "unavailable" diff --git a/0.76_My_PuTTY/windows/version.rc2 b/0.76_My_PuTTY/windows/version.rc2 index a5316c5..532b79c 100644 --- a/0.76_My_PuTTY/windows/version.rc2 +++ b/0.76_My_PuTTY/windows/version.rc2 @@ -63,7 +63,7 @@ BEGIN VALUE "FileVersion", TEXTVER #endif #if (defined MOD_PERSO) && (!defined FLJ) - VALUE "ProductVersion", TEXTVER " - Additional features on KiTTY That's all folks! by 9bis.com, 2005-2021" + VALUE "ProductVersion", TEXTVER " - Additional features on KiTTY That's all folks! by 9bis.com, 2005-2022" #else VALUE "ProductVersion", TEXTVER #endif diff --git a/0.76_My_PuTTY/windows/version_minor.txt b/0.76_My_PuTTY/windows/version_minor.txt index 7ed6ff8..1e8b314 100644 --- a/0.76_My_PuTTY/windows/version_minor.txt +++ b/0.76_My_PuTTY/windows/version_minor.txt @@ -1 +1 @@ -5 +6 diff --git a/0.76_My_PuTTY/windows/win_res.rc2 b/0.76_My_PuTTY/windows/win_res.rc2 index 65daf71..5512a3d 100644 --- a/0.76_My_PuTTY/windows/win_res.rc2 +++ b/0.76_My_PuTTY/windows/win_res.rc2 @@ -288,7 +288,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_MAINICON_0,IDC_STATIC,7,7,30,20 LTEXT "",IDA_VERSION,45,7,198,8 - LTEXT "Copyright \251 2005-2021",IDC_STATIC,45,19,78,8 + LTEXT "Copyright \251 2005-2022",IDC_STATIC,45,19,78,8 LTEXT "9bis software - https://www.9bis.net/kitty", IDC_WEBPAGE,45,31,145,8 LTEXT "Contact:",IDC_STATIC,45,43,46,8 diff --git a/0.76_My_PuTTY/windows/windlg.c b/0.76_My_PuTTY/windows/windlg.c index 06c138f..bbf9886 100644 --- a/0.76_My_PuTTY/windows/windlg.c +++ b/0.76_My_PuTTY/windows/windlg.c @@ -243,7 +243,7 @@ static INT_PTR CALLBACK LicenceProc(HWND hwnd, UINT msg, #if (defined MOD_PERSO) && (!defined FLJ) //static const char MESSAGE[] = ""; -static const char MESSAGE[] = " KiTTY software is developed by Cyd for 9bis.com, copyright \251 2005-2021, thanks to Leo for bcrypt and mini libraries, thanks to all contributors " ; +static const char MESSAGE[] = " KiTTY software is developed by Cyd for 9bis.com, copyright \251 2005-2022, thanks to Leo for bcrypt and mini libraries, thanks to all contributors " ; static INT_PTR CALLBACK AboutProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) diff --git a/blocnote/notepad.a b/blocnote/notepad.a index cb0480e544aabd19728cdc98ad2d40c1232c7579..fed79634cf639dc255dd56ef8225de06c0e016bf 100644 GIT binary patch delta 58 zcmezLm+{kI#tBj!CWZ!PCWfY_8+Dfe9FG%D=+LXt?=mtt=w| DL~s(U diff --git a/blocnote/notepad.rc b/blocnote/notepad.rc index 2dcf60c..32485f8 100644 --- a/blocnote/notepad.rc +++ b/blocnote/notepad.rc @@ -49,5 +49,5 @@ BEGIN NOTEPAD_FILE_FILTER "Text files, (*.txt, *.ini)|*.txt;*.ini|C/C++ files, (*.c, *.cpp, *.h, *.rc)|*.c;*.cpp;*.h;*.rc|Script files, (*.ksh, *.sh)|*.ksh;*.sh\0SQL files, (*.sql)|*.sql|All files, (*.*)|*.*\0" - NOTEPAD_STR_LICENCE " mNotepad 1.0\nwritten by Cyd, 2021, for the Telnet/SSH client TTY" + NOTEPAD_STR_LICENCE " mNotepad 1.0\nwritten by Cyd, 2022, for the Telnet/SSH client TTY" END diff --git a/docs/version.txt b/docs/version.txt index 094b11f..5221e32 100644 --- a/docs/version.txt +++ b/docs/version.txt @@ -1 +1 @@ -0.76.0.5 \ No newline at end of file +0.76.0.6 \ No newline at end of file diff --git a/kitty_launcher.c b/kitty_launcher.c index 81d4d90..4025d76 100644 --- a/kitty_launcher.c +++ b/kitty_launcher.c @@ -574,7 +574,7 @@ LRESULT CALLBACK Launcher_WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP case WM_COMMAND: {//Commandes du menu switch( LOWORD(wParam) ) { case IDM_ABOUT: - MessageBox(hwnd," TTY Launcher\nSession launcher for TTY terminal emulator\n(c), 2009-2021","About", MB_OK ) ; + MessageBox(hwnd," TTY Launcher\nSession launcher for TTY terminal emulator\n(c), 2009-2022","About", MB_OK ) ; break ; case IDM_QUIT: ResShell = Shell_NotifyIcon(NIM_DELETE, &TrayIcone) ;