From d8a450b2ba6026c85d89a3eb0de665bcd610d86e Mon Sep 17 00:00:00 2001 From: cyd01 Date: Fri, 24 Jun 2022 08:38:36 +0200 Subject: [PATCH] Tagging the 0.76.0.10 release of the KiTTY project. --- 0.76_My_PuTTY/version.h | 2 +- 0.76_My_PuTTY/windows/MAKEFILE.MINGW | 12 +++++------ 0.76_My_PuTTY/windows/version_minor.txt | 2 +- 0.76_My_PuTTY/windows/winstore.c | 27 ++++++++++++++++++++++++- 0.76b_My_PuTTY/windows/MAKEFILE.MINGW | 2 +- 0.76b_My_PuTTY/windows/winstore.c | 27 ++++++++++++++++++++++++- docs/version.txt | 2 +- 7 files changed, 62 insertions(+), 12 deletions(-) diff --git a/0.76_My_PuTTY/version.h b/0.76_My_PuTTY/version.h index 79d61c0..04d6cef 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,9 +#define BINARY_VERSION 0,76,0,10 #define SOURCE_COMMIT "unavailable" diff --git a/0.76_My_PuTTY/windows/MAKEFILE.MINGW b/0.76_My_PuTTY/windows/MAKEFILE.MINGW index 7203fd6..601b060 100644 --- a/0.76_My_PuTTY/windows/MAKEFILE.MINGW +++ b/0.76_My_PuTTY/windows/MAKEFILE.MINGW @@ -209,7 +209,7 @@ pageant.exe: aqsync.o be_misc.o callback.o conf.o ecc.o errsock.o marshal.o \ winpgnt.o winpgntc.o winsecur.o winselgui.o winutils.o \ notiming.o \ kitty_commun.o kitty_crypt.o kitty_registry.o - $(CC) $(LDFLAGS) -o $@ -Wl,-Map,pageant.map aqsync.o \ + $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,pageant.map aqsync.o \ be_misc.o callback.o conf.o ecc.o errsock.o marshal.o \ memory.o misc.o mpint.o pageant.o pageant.res.o sshaes.o \ sshargon2.o sshauxcrypt.o sshblake2.o sshdes.o sshdss.o \ @@ -426,7 +426,7 @@ putty.exe: agentf.o aqsync.o be_all_s.o be_misc.o callback.o cmdline.o \ urlhack.o pageant_integrated.o winpgnt_integrated.o winpgen_integrated.o winpzmodem.o \ import.o sshrsag.o sshdssg.o sshprime.o sshecdsag.o sshbcrypt.o pockle.o primecandidate.o millerrabin.o mpunsafe.o \ void.o $(UTF8MOUSE_OBJS) - $(CC) $(LDFLAGS) -o $@ -Wl,-Map,putty.map agentf.o \ + $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,putty.map agentf.o \ aqsync.o be_all_s.o be_misc.o callback.o cmdline.o conf.o \ config.o cproxy.o dialog.o ecc.o errsock.o ldisc.o logging.o \ mainchan.o marshal.o memory.o minibidi.o misc.o miscucs.o \ @@ -475,7 +475,7 @@ puttygen.exe: conf.o ecc.o import.o marshal.o memory.o millerrabin.o misc.o \ winmisc.o winmiscs.o winnoise.o winnojmp.o winpgen.o \ winsecur.o winstore.o wintime.o winutils.o \ kitty_commun.o kitty_crypt.o kitty_registry.o kitty_keygen.o kitty_store.o kitty_tools.o - $(CC) $(LDFLAGS) -o $@ -Wl,-Map,puttygen.map conf.o ecc.o \ + $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,puttygen.map conf.o ecc.o \ import.o marshal.o memory.o millerrabin.o misc.o mpint.o \ mpunsafe.o notiming.o pockle.o primecandidate.o \ puttygen.res.o smallprimes.o sshaes.o sshargon2.o \ @@ -501,7 +501,7 @@ puttytel.exe: be_misc.o be_nos_s.o callback.o cmdline.o conf.o config.o \ winhelp.o winhsock.o winjump.o winmisc.o winmiscs.o winnet.o \ winprint.o winproxy.o winsecur.o winselgui.o winser.o \ winstore.o wintime.o winucs.o winutils.o - $(CC) $(LDFLAGS) -o $@ -Wl,-Map,puttytel.map be_misc.o \ + $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,puttytel.map be_misc.o \ be_nos_s.o callback.o cmdline.o conf.o config.o dialog.o \ errsock.o ldisc.o logging.o marshal.o memory.o minibidi.o \ misc.o miscucs.o nocproxy.o nogss.o norand.o pinger.o \ @@ -2218,7 +2218,7 @@ putty_notrans.exe: agentf.o aqsync.o be_all_s.o be_misc.o callback.o cmdline.o \ urlhack.o pageant_integrated.o winpgnt_integrated.o winpgen_integrated.o \ import.o sshrsag.o sshdssg.o sshprime.o sshecdsag.o sshbcrypt.o \ void.o $(UTF8MOUSE_OBJS) - $(CC) $(LDFLAGS) -o $@ -Wl,-Map,putty.map agentf.o \ + $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,putty.map agentf.o \ aqsync.o be_all_s.o be_misc.o callback.o cmdline.o conf.o \ config.o cproxy.o dialog.o ecc.o errsock.o ldisc.o \ ldiscucs.o logging.o mainchan.o marshal.o memory.o \ @@ -2282,7 +2282,7 @@ putty_portable.exe: agentf.o aqsync.o be_all_s.o be_misc.o callback.o cmdline.o urlhack.o pageant_integrated.o winpgnt_integrated.o winpgen_integrated.o winpzmodem.o \ import.o sshrsag.o sshdssg.o sshprime.o sshecdsag.o sshbcrypt.o pockle.o primecandidate.o millerrabin.o mpunsafe.o \ void.o $(UTF8MOUSE_OBJS) - $(CC) $(LDFLAGS) -o $@ -Wl,-Map,putty.map agentf.o \ + $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,putty.map agentf.o \ aqsync.o be_all_s.o be_misc.o callback.o cmdline.o conf.o \ config.o cproxy.o dialog.o ecc.o errsock.o ldisc.o logging.o \ mainchan.o marshal.o memory.o minibidi.o misc.o miscucs.o \ diff --git a/0.76_My_PuTTY/windows/version_minor.txt b/0.76_My_PuTTY/windows/version_minor.txt index ec63514..f599e28 100644 --- a/0.76_My_PuTTY/windows/version_minor.txt +++ b/0.76_My_PuTTY/windows/version_minor.txt @@ -1 +1 @@ -9 +10 diff --git a/0.76_My_PuTTY/windows/winstore.c b/0.76_My_PuTTY/windows/winstore.c index 89ddaa9..b0a3a92 100644 --- a/0.76_My_PuTTY/windows/winstore.c +++ b/0.76_My_PuTTY/windows/winstore.c @@ -1055,6 +1055,31 @@ static HANDLE access_random_seed(int action) } } +if( get_param("INIFILE")==SAVEMODE_DIR ) { + char InitDir[4096] ; + int i ; + if( GetModuleFileName( NULL, (LPTSTR)InitDir, 4096 ) ) { + if( strlen( InitDir ) > 0 ) { + i = strlen( InitDir ) -1 ; + do { + if( InitDir[i] == '\\' ) { InitDir[i]='\0' ; i = 0 ; } + i-- ; + } while( i >= 0 ) ; + } + } else { + strcpy( InitDir, "" ) ; + } + + /* + * Test start directory + */ + { + //DWORD len = strlen(InitialDirectory) ; + if( try_random_seed_and_free( + dupcat(InitDir, "\\PUTTY.RND"), action, &rethandle) ) + return rethandle; + } +} else { /* * Next, try the user's local Application Data directory, * followed by their non-local one. This is found using the @@ -1120,7 +1145,7 @@ static HANDLE access_random_seed(int action) dupcat(windir, "\\PUTTY.RND"), action, &rethandle)) return rethandle; } - +} /* * If even that failed, give up. */ diff --git a/0.76b_My_PuTTY/windows/MAKEFILE.MINGW b/0.76b_My_PuTTY/windows/MAKEFILE.MINGW index 82f5275..76f08c9 100644 --- a/0.76b_My_PuTTY/windows/MAKEFILE.MINGW +++ b/0.76b_My_PuTTY/windows/MAKEFILE.MINGW @@ -426,7 +426,7 @@ putty.exe: agentf.o aqsync.o be_all_s.o be_misc.o callback.o cmdline.o \ urlhack.o pageant_integrated.o winpgnt_integrated.o winpgen_integrated.o winpzmodem.o \ import.o sshrsag.o sshdssg.o sshprime.o sshecdsag.o bcrypt.o pockle.o primecandidate.o millerrabin.o mpunsafe.o \ void.o $(UTF8MOUSE_OBJS) - $(CC) $(LDFLAGS) -o $@ -Wl,-Map,putty.map agentf.o \ + $(CC) -mwindows $(LDFLAGS) -o $@ -Wl,-Map,putty.map agentf.o \ aqsync.o be_all_s.o be_misc.o callback.o cmdline.o conf.o \ config.o cproxy.o dialog.o ecc.o errsock.o ldisc.o logging.o \ mainchan.o marshal.o memory.o minibidi.o misc.o dup_mb_to_wc.o \ diff --git a/0.76b_My_PuTTY/windows/winstore.c b/0.76b_My_PuTTY/windows/winstore.c index 89ddaa9..b0a3a92 100644 --- a/0.76b_My_PuTTY/windows/winstore.c +++ b/0.76b_My_PuTTY/windows/winstore.c @@ -1055,6 +1055,31 @@ static HANDLE access_random_seed(int action) } } +if( get_param("INIFILE")==SAVEMODE_DIR ) { + char InitDir[4096] ; + int i ; + if( GetModuleFileName( NULL, (LPTSTR)InitDir, 4096 ) ) { + if( strlen( InitDir ) > 0 ) { + i = strlen( InitDir ) -1 ; + do { + if( InitDir[i] == '\\' ) { InitDir[i]='\0' ; i = 0 ; } + i-- ; + } while( i >= 0 ) ; + } + } else { + strcpy( InitDir, "" ) ; + } + + /* + * Test start directory + */ + { + //DWORD len = strlen(InitialDirectory) ; + if( try_random_seed_and_free( + dupcat(InitDir, "\\PUTTY.RND"), action, &rethandle) ) + return rethandle; + } +} else { /* * Next, try the user's local Application Data directory, * followed by their non-local one. This is found using the @@ -1120,7 +1145,7 @@ static HANDLE access_random_seed(int action) dupcat(windir, "\\PUTTY.RND"), action, &rethandle)) return rethandle; } - +} /* * If even that failed, give up. */ diff --git a/docs/version.txt b/docs/version.txt index fdcdee3..1650994 100644 --- a/docs/version.txt +++ b/docs/version.txt @@ -1 +1 @@ -0.76.0.9 \ No newline at end of file +0.76.0.10 \ No newline at end of file