Commit: 509c4e904ccd477e38ec9a174bff485b6119e904 - Tera_Term_Testing (git)

Tera Termの個人的な作業用リポジトリ

Commit MetaInfo

• Revision: 509c4e904ccd477e38ec9a174bff485b6119e904 (tree)
• Time: 2022-09-09 18:40:57
• Author: IWAMOTO Kouichi <sue@iwmt...>
• Commiter: IWAMOTO Kouichi

Log Message

KexKeyLogFile設定をUnicode化した

ただし、現時点ではCP932に無い文字を使っているとセッションの複製時等に
ログが記録されなくなる。この問題は別途対応予定。

あわせて、相対パスで指定時はログ保存フォルダ基準に変更した。

git-svn-id: svn+ssh://svn.osdn.net/svnroot/ttssh2/trunk@10254 f5f01b69-1e22-0410-acbf-894ab4bd6246

Change Summary

• modified: ttssh2/ttxssh/ssh.c
• modified: ttssh2/ttxssh/ttxssh.c
• modified: ttssh2/ttxssh/ttxssh.h

Incremental Difference

--- a/ttssh2/ttxssh/ssh.c
+++ b/ttssh2/ttxssh/ssh.c
@@ -654,13 +654,21 @@ void log_kex_key(PTInstVar pvar, const BIGNUM *secret)
 	int fd, i;
 	unsigned char buff[4], *cookie;
 	char *hexstr;
+	wchar_t *fname;
 
 	if (pvar->settings.KexKeyLogging && pvar->settings.KexKeyLogFile[0] != 0) {
 		hexstr = BN_bn2hex(secret);
 		if (hexstr == NULL) {
 			return;
 		}
-		fd = _open(pvar->settings.KexKeyLogFile,
+
+		fname = get_log_dir_relative_nameW(pvar->settings.KexKeyLogFile);
+		if (fname == NULL) {
+			OPENSSL_free(hexstr);
+			return;
+		}
+
+		fd = _wopen(fname,
 			_O_RDWR | _O_APPEND | _O_CREAT | _O_TEXT,
 			_S_IREAD | _S_IWRITE);
 		if (fd >= 0) {
@@ -674,6 +682,7 @@ void log_kex_key(PTInstVar pvar, const BIGNUM *secret)
 			_write(fd, "\n", 1);
 			_close(fd);
 		}
+		free(fname);
 		OPENSSL_free(hexstr);
 	}
 #endif

--- a/ttssh2/ttxssh/ttxssh.c
+++ b/ttssh2/ttxssh/ttxssh.c
@@ -374,7 +374,7 @@ static void read_ssh_options(PTInstVar pvar, const wchar_t *fileName)
 	settings->AuthBanner = GetPrivateProfileInt("TTSSH", "AuthBanner", 1, fileName);
 
 #ifdef _DEBUG
-	read_string_option(fileName, "KexKeyLogFile", "", settings->KexKeyLogFile, sizeof(settings->KexKeyLogFile));
+	GetPrivateProfileStringW(L"TTSSH", L"KexKeyLogFile", L"", settings->KexKeyLogFile, _countof(settings->KexKeyLogFile), fileName);
 	if (settings->KexKeyLogFile[0] == 0) {
 		settings->KexKeyLogging = 0;
 	}
@@ -519,7 +519,7 @@ static void write_ssh_options(PTInstVar pvar, const wchar_t *fileName,
 	WritePrivateProfileString("TTSSH", "AuthBanner", buf, fileName);
 
 #ifdef _DEBUG
-	WritePrivateProfileString("TTSSH", "KexKeyLogFile", settings->KexKeyLogFile, fileName);
+	WritePrivateProfileStringW(L"TTSSH", L"KexKeyLogFile", settings->KexKeyLogFile, fileName);
 	WritePrivateProfileString("TTSSH", "KexKeyLogging",
 	                          settings->KexKeyLogging ? "1" : "0", fileName);
 #endif

--- a/ttssh2/ttxssh/ttxssh.h
+++ b/ttssh2/ttxssh/ttxssh.h
@@ -210,7 +210,7 @@ typedef struct _TS_SSH {
 	int AuthBanner;
 
 	BOOL KexKeyLogging;
-	char KexKeyLogFile[1024];
+	wchar_t KexKeyLogFile[1024];
 } TS_SSH;
 
 typedef struct _TInstVar {