Commit: c967494dc1350394139c0ae8661d8f1535637367 - Tera_Term_Testing (git)

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

Commit MetaInfo

• Revisão: c967494dc1350394139c0ae8661d8f1535637367 (tree)
• Hora: 2022-09-06 23:12:10
• Autor: IWAMOTO Kouichi <sue@iwmt...>
• Commiter: IWAMOTO Kouichi

Mensagem de Log

Client Secretの記録形式をWiresharkが扱う形式に合わせた。

記録時にメモリーリークしていたのも修正した。

Mudança Sumário

• modified: ttssh2/ttxssh/ssh.c

Diff

--- a/ttssh2/ttxssh/ssh.c
+++ b/ttssh2/ttxssh/ssh.c
@@ -646,28 +646,32 @@ void push_bignum_memdump(char *name, char *desc, BIGNUM *bignum)
 	free(buf); // free
 }
 
-log_kex_key(PTInstVar pvar, char *type, char *msg)
+void log_kex_key(PTInstVar pvar, const BIGNUM *secret)
 {
 	int fd, i;
 	unsigned char buff[4], *cookie;
+	char *hexstr;
 
 	if (pvar->settings.KexKeyLogging && pvar->settings.KexKeyLogFile[0] != 0) {
+		hexstr = BN_bn2hex(secret);
+		if (hexstr == NULL) {
+			return;
+		}
 		fd = _open(pvar->settings.KexKeyLogFile,
 			_O_RDWR | _O_APPEND | _O_CREAT | _O_TEXT,
 			_S_IREAD | _S_IWRITE);
 		if (fd >= 0) {
 			cookie = pvar->crypt_state.client_cookie;
-			_write(fd, type, strlen(type));
-			_write(fd, " ", 1);
 			for (i=0; i<16; i++) {
 				_snprintf_s(buff, sizeof(buff), _TRUNCATE, "%02x", cookie[i]);
 				_write(fd, buff, 2);
 			}
 			_write(fd, " ", 1);
-			_write(fd, msg, strlen(msg));
+			_write(fd, hexstr, strlen(hexstr));
 			_write(fd, "\n", 1);
 			_close(fd);
 		}
+		OPENSSL_free(hexstr);
 	}
 }
 
@@ -5099,7 +5103,7 @@ static void SSH2_dh_kex_init(PTInstVar pvar)
 
 	// 秘密にすべき乱数(X)を生成
 	dh_gen_key(pvar, dh, pvar->we_need);
-	log_kex_key(pvar, "CLIENT_SECRET", BN_bn2hex(dh->priv_key));
+	log_kex_key(pvar, dh->priv_key);
 
 	msg = buffer_init();
 	if (msg == NULL) {
@@ -5331,7 +5335,7 @@ static BOOL handle_SSH2_dh_gex_group(PTInstVar pvar)
 	// 秘密にすべき乱数(X)を生成
 	dh_gen_key(pvar, dh, pvar->we_need);
 
-	log_kex_key(pvar, "CLIENT_SECRET", BN_bn2hex(dh->priv_key));
+	log_kex_key(pvar, dh->priv_key);
 
 	// 公開鍵をサーバへ送信
 	msg = buffer_init();
@@ -5410,7 +5414,7 @@ static void SSH2_ecdh_kex_init(PTInstVar pvar)
 	}
 	group = EC_KEY_get0_group(client_key);
 
-	log_kex_key(pvar, "CLIENT_SECRET", BN_bn2hex(EC_KEY_get0_private_key(client_key)));
+	log_kex_key(pvar, EC_KEY_get0_private_key(client_key));
 
 	msg = buffer_init();
 	if (msg == NULL) {