コミット: 06ab4e9e01afcc92563c5c9d3a913ccf7f1a5227 - Tera_Term_Testing (git)

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

コミットメタ情報

• リビジョン: 06ab4e9e01afcc92563c5c9d3a913ccf7f1a5227 (tree)
• 日時: 2022-09-06 23:12:11
• 作者: IWAMOTO Kouichi <sue@iwmt...>
• コミッター: IWAMOTO Kouichi

ログメッセージ

Debugビルド時のみKexKeyLoggingが有効になるように変更した

変更サマリ

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

差分

--- a/ttssh2/ttxssh/ssh.c
+++ b/ttssh2/ttxssh/ssh.c
@@ -64,7 +64,9 @@
 
 #include <direct.h>
 #include <io.h>
+#ifdef _DEBUG	// KEX logging
 #include <fcntl.h>
+#endif
 
 // SSH2 macro
 #ifdef _DEBUG
@@ -648,6 +650,7 @@ void push_bignum_memdump(char *name, char *desc, BIGNUM *bignum)
 
 void log_kex_key(PTInstVar pvar, const BIGNUM *secret)
 {
+#ifdef _DEBUG	// KEX logging
 	int fd, i;
 	unsigned char buff[4], *cookie;
 	char *hexstr;
@@ -673,6 +676,7 @@ void log_kex_key(PTInstVar pvar, const BIGNUM *secret)
 		}
 		OPENSSL_free(hexstr);
 	}
+#endif
 }
 
 static unsigned int get_predecryption_amount(PTInstVar pvar)
@@ -5334,7 +5338,6 @@ static BOOL handle_SSH2_dh_gex_group(PTInstVar pvar)
 
 	// 秘密にすべき乱数(X)を生成
 	dh_gen_key(pvar, dh, pvar->we_need);
-
 	log_kex_key(pvar, dh->priv_key);
 
 	// 公開鍵をサーバへ送信
@@ -5413,7 +5416,6 @@ static void SSH2_ecdh_kex_init(PTInstVar pvar)
 		goto error;
 	}
 	group = EC_KEY_get0_group(client_key);
-
 	log_kex_key(pvar, EC_KEY_get0_private_key(client_key));
 
 	msg = buffer_init();

--- a/ttssh2/ttxssh/ttxssh.c
+++ b/ttssh2/ttxssh/ttxssh.c
@@ -373,6 +373,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));
 	if (settings->KexKeyLogFile[0] == 0) {
 		settings->KexKeyLogging = 0;
@@ -380,6 +381,10 @@ static void read_ssh_options(PTInstVar pvar, const wchar_t *fileName)
 	else {
 		settings->KexKeyLogging = GetPrivateProfileInt("TTSSH", "KexKeyLogging", 0, fileName);
 	}
+#else
+	settings->KexKeyLogFile[0] = 0;
+	settings->KexKeyLogging = 0;
+#endif
 
 	clear_local_settings(pvar);
 }
@@ -513,9 +518,11 @@ static void write_ssh_options(PTInstVar pvar, const wchar_t *fileName,
 	_itoa_s(settings->AuthBanner, buf, sizeof(buf), 10);
 	WritePrivateProfileString("TTSSH", "AuthBanner", buf, fileName);
 
+#ifdef _DEBUG
 	WritePrivateProfileString("TTSSH", "KexKeyLogFile", settings->KexKeyLogFile, fileName);
 	WritePrivateProfileString("TTSSH", "KexKeyLogging",
 	                          settings->KexKeyLogging ? "1" : "0", fileName);
+#endif
 }