From 74249fd97def5f0cb1607270c2fbaf174071e14d Mon Sep 17 00:00:00 2001
From: cyd01 <cyrildupont71@gmail.com>
Date: Fri, 31 Dec 2021 08:49:44 +0100
Subject: [PATCH] Tagging the 0.76.0.3 release of the KiTTY project.

---
 0.76_My_PuTTY/pageant.c                 | 28 +++++++++++--------------
 0.76_My_PuTTY/version.h                 |  2 +-
 0.76_My_PuTTY/windows/version_minor.txt |  2 +-
 0.76_My_PuTTY/windows/winpgnt.c         |  1 -
 docs/version.txt                        |  2 +-
 5 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/0.76_My_PuTTY/pageant.c b/0.76_My_PuTTY/pageant.c
index 1c033ef..b8b5c1b 100644
--- a/0.76_My_PuTTY/pageant.c
+++ b/0.76_My_PuTTY/pageant.c
@@ -367,6 +367,7 @@ void scrumble_int(void) {
 	}
 }
 int get_scrumble_int( int i ) {
+	//return i ;  // Ne marche pas
 	if( (tab_int == NULL) || !GetScrumbleKeyFlag() ) { return i ; }
 	else { return tab_int[i] ; }
 }
@@ -376,17 +377,15 @@ static int confirm_key_usage(char* fingerprint, char* comment) {
 	int result = IDYES; // successful result is the default
 
 	message = dupprintf("Allow authentication with key with fingerprint\n%s\ncomment: %s", fingerprint, comment);
-	
-	if( (GetAskConfirmationFlag()==1) 
+	if(comment!=NULL) if( ( GetAskConfirmationFlag()==1 ) 
 		||
 		( (GetAskConfirmationFlag()==2) && (
-		(NULL != strstr(comment, "needs confirm"))||(NULL != strstr(comment, "need confirm"))||(NULL != strstr(comment, "confirmation"))
+		   (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 (result != IDYES) {
 		sfree(message);
 		return 0;
@@ -806,9 +805,6 @@ static PageantAsyncOp *pageant_make_op(
         unsigned response_type;
         unsigned char response_md5[16];
         int i;
-#ifdef MOD_PERSO
-		char *fingerprint;
-#endif
 	
         pageant_client_log(pc, reqid, "request: SSH1_AGENTC_RSA_CHALLENGE");
 
@@ -842,6 +838,7 @@ static PageantAsyncOp *pageant_make_op(
             goto challenge1_cleanup;
         }
 #ifdef MOD_PERSO
+	char *fingerprint;
 		fingerprint = rsa_ssh1_fingerprint(pk->rkey);
 		if (! confirm_key_usage(fingerprint, pk->rkey->comment)) {
 	      goto challenge1_cleanup;
@@ -878,10 +875,6 @@ static PageantAsyncOp *pageant_make_op(
         PageantKey *pk;
         ptrlen keyblob, sigdata;
         uint32_t flags;
-#ifdef MOD_PERSO
-		char* confirm_fingerprint;
-#endif
-
         pageant_client_log(pc, reqid, "request: SSH2_AGENTC_SIGN_REQUEST");
 
         keyblob = get_string(msg);
@@ -916,12 +909,15 @@ static PageantAsyncOp *pageant_make_op(
             goto responded;
         }
 #ifdef MOD_PERSO
-		confirm_fingerprint = ssh2_fingerprint_blob(keyblob, SSH_FPTYPE_DEFAULT);
+	char* confirm_fingerprint;
+	confirm_fingerprint = ssh2_fingerprint_blob(keyblob, SSH_FPTYPE_DEFAULT);
+	if( confirm_fingerprint!=NULL ) {
 		if (! confirm_key_usage( confirm_fingerprint, pk->rkey->comment)) {
 			sfree(confirm_fingerprint);
-			return;
-	    }
+			return 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 73f3e43..6cb9c9f 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,2
+#define BINARY_VERSION 0,76,0,3
 #define SOURCE_COMMIT "unavailable"
diff --git a/0.76_My_PuTTY/windows/version_minor.txt b/0.76_My_PuTTY/windows/version_minor.txt
index 0cfbf08..00750ed 100644
--- a/0.76_My_PuTTY/windows/version_minor.txt
+++ b/0.76_My_PuTTY/windows/version_minor.txt
@@ -1 +1 @@
-2
+3
diff --git a/0.76_My_PuTTY/windows/winpgnt.c b/0.76_My_PuTTY/windows/winpgnt.c
index 998aa1c..baf092a 100644
--- a/0.76_My_PuTTY/windows/winpgnt.c
+++ b/0.76_My_PuTTY/windows/winpgnt.c
@@ -500,7 +500,6 @@ static void win_add_keyfile(Filename *filename, bool encrypted)
 	if( strlen(pphrase)>0 ) {
 	    pps.passphrase=(char*)malloc(strlen(pphrase)+1);
 	    strcpy(pps.passphrase,pphrase);
-	    
         } 
 	else
 #endif
diff --git a/docs/version.txt b/docs/version.txt
index 7668f5e..164d8cd 100644
--- a/docs/version.txt
+++ b/docs/version.txt
@@ -1 +1 @@
-0.76.0.2
\ No newline at end of file
+0.76.0.3
\ No newline at end of file