Tera TermRevision: 10932
https://osdn.net/projects/ttssh2/scm/svn/commits/10932
Author: nmaya
Date: 2023-09-16 08:50:13 +0900 (Sat, 16 Sep 2023)
Log Message:
-----------
秘密鍵生成ダイアログのデフォルトを RSA 3072bit から ED25519 に変更
ダイアログ初期状態を変更
- 鍵の種類: ED25519
- bit長: 256bit
- bit長入力欄: 編集不可（256bit固定のため）
- bcrypt KDF チェックボックス: 編集不可（on固定のため）
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/ttssh2/ttxssh/ssh.h
trunk/ttssh2/ttxssh/ttxssh.c
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2023-09-15 16:38:55 UTC (rev 10931)
+++ trunk/doc/en/html/about/history.html 2023-09-15 23:50:13 UTC (rev 10932)
@@ -3356,7 +3356,7 @@
<li>disabled SSH2 KEX algorithm by default for RFC 9142 recommendations: diffie-hellman-group1-sha1, diffie-hellman-group-exchange-sha1</li>
<li>changed default SSH heartbeat (keep-alive) interval to 300 seconds.</li>
<li>now TTSSH icon is used when the notify caused by TTSSH.</li>
- <li>increased the default RSA key size to 3072 bits on <a href="../menu/setup-sshkeygenerator.html">Key Generator dialog</a>.</li>
+ <li>changed the default key type to ED25519 on <a href="../menu/setup-sshkeygenerator.html">Key Generator dialog</a>.</li>
</ul>
</li>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2023-09-15 16:38:55 UTC (rev 10931)
+++ trunk/doc/ja/html/about/history.html 2023-09-15 23:50:13 UTC (rev 10932)
@@ -3364,7 +3364,7 @@
<li>RFC 9142 \x82̊\xA9\x8D\x90\x82ɂ\xE6\x82\xE8\x81ASSH2 \x82\xCC diffie-hellman-group1-sha1, diffie-hellman-group-exchange-sha1 \x8C\xAE\x8C\xF0\x8A\xB7\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80\x82\xF0\x83f\x83t\x83H\x83\x8B\x83g\x82Ŗ\xB3\x8C\xF8\x82ɂ\xB5\x82\xBD\x81B</li>
<li>\x83L\x81[\x83v\x83A\x83\x89\x83C\x83u\x83p\x83P\x83b\x83g\x82̑\x97\x90M\x8AԊu\x82̃f\x83t\x83H\x83\x8B\x83g\x82\xF0 300 \x95b\x82ɕύX\x82\xB5\x82\xBD\x81B</li>
<li>TTSSH \x82\xA9\x82\xE7\x92ʒm\x82\xAA\x82\xA0\x82\xC1\x82\xBD\x82Ƃ\xAB\x82ɂ\xCD TTSSH \x82̃A\x83C\x83R\x83\x93\x82\xAA\x8Eg\x82\xED\x82\xEA\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
- <li><a href="../menu/setup-sshkeygenerator.html">SSH\x8C\xAE\x90\xB6\x90\xAC\x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xCC RSA \x8C\xAE\x82̃f\x83t\x83H\x83\x8B\x83g\x82̒\xB7\x82\xB3\x82\xF0 3072bit \x82ɕύX\x82\xB5\x82\xBD\x81B</li>
+ <li><a href="../menu/setup-sshkeygenerator.html">SSH\x8C\xAE\x90\xB6\x90\xAC\x83_\x83C\x83A\x83\x8D\x83O</a>\x82̃f\x83t\x83H\x83\x8B\x83g\x82̌\xAE\x8C`\x8E\xAE\x82\xF0 ED25519 \x82ɕύX\x82\xB5\x82\xBD\x81B</li>
</ul>
</li>
Modified: trunk/ttssh2/ttxssh/ssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ssh.h 2023-09-15 16:38:55 UTC (rev 10931)
+++ trunk/ttssh2/ttxssh/ssh.h 2023-09-15 23:50:13 UTC (rev 10932)
@@ -284,7 +284,7 @@
/* Minimum modulus size (n) for RSA keys. */
#define SSH_RSA_MINIMUM_MODULUS_SIZE 768
-#define SSH_KEYGEN_DEFAULT_BITS 3072
+#define SSH_KEYGEN_DEFAULT_BITS 256
#define SSH_RSA_MINIMUM_KEY_SIZE 768
#define SSH_DSA_MINIMUM_KEY_SIZE 1024
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c 2023-09-15 16:38:55 UTC (rev 10931)
+++ trunk/ttssh2/ttxssh/ttxssh.c 2023-09-15 23:50:13 UTC (rev 10932)
@@ -3766,11 +3766,12 @@
init_password_control(pvar, dlg, IDC_CONFIRM_EDIT, NULL);
// default key type
- SendMessage(GetDlgItem(dlg, IDC_RSA_TYPE), BM_SETCHECK, BST_CHECKED, 0);
- key_type = KEY_RSA;
+ SendMessage(GetDlgItem(dlg, IDC_ED25519_TYPE), BM_SETCHECK, BST_CHECKED, 0);
+ key_type = KEY_ED25519;
saved_key_bits = GetDlgItemInt(dlg, IDC_KEYBITS, NULL, FALSE);
// default key bits
+ EnableWindow(GetDlgItem(dlg, IDC_KEYBITS), FALSE);
SetDlgItemInt(dlg, IDC_KEYBITS, SSH_KEYGEN_DEFAULT_BITS, FALSE);
SendDlgItemMessage(dlg, IDC_KEYBITS, EM_LIMITTEXT, 4, 0);
@@ -3786,7 +3787,7 @@
EnableWindow(GetDlgItem(dlg, IDC_SAVE_PRIBATE_KEY), FALSE);
// default bcrypt KDF
- EnableWindow(GetDlgItem(dlg, IDC_BCRYPT_KDF_CHECK), TRUE);
+ EnableWindow(GetDlgItem(dlg, IDC_BCRYPT_KDF_CHECK), FALSE);
SendMessage(GetDlgItem(dlg, IDC_BCRYPT_KDF_CHECK), BM_SETCHECK, BST_CHECKED, 0);
EnableWindow(GetDlgItem(dlg, IDC_BCRYPT_KDF_ROUNDS), TRUE);
SetDlgItemInt(dlg, IDC_BCRYPT_KDF_ROUNDS, DEFAULT_ROUNDS, FALSE);