Tera TermRevision: 7858
https://osdn.net/projects/ttssh2/scm/svn/commits/7858
Author: yutakapon
Date: 2019-07-18 23:47:19 +0900 (Thu, 18 Jul 2019)
Log Message:
-----------
単体テスト完了した箇所のコメントを除去した。
TTXKeyGeneratorでgenerate_ssh_key()が失敗した場合においても、ダイアログをクローズできるようにした。
チケット #36876
Ticket Links:
------------
https://osdn.net/projects/ttssh2/tracker/detail/36876
Modified Paths:
--------------
branches/openssl_1_1_1_v2/ttssh2/ttxssh/kex.c
branches/openssl_1_1_1_v2/ttssh2/ttxssh/ttxssh.c
-------------- next part --------------
Modified: branches/openssl_1_1_1_v2/ttssh2/ttxssh/kex.c
===================================================================
--- branches/openssl_1_1_1_v2/ttssh2/ttxssh/kex.c 2019-07-17 15:37:28 UTC (rev 7857)
+++ branches/openssl_1_1_1_v2/ttssh2/ttxssh/kex.c 2019-07-18 14:47:19 UTC (rev 7858)
@@ -430,7 +430,6 @@
static unsigned char digest[EVP_MAX_MD_SIZE];
EVP_MD_CTX *md = NULL;
- /********* OPENSSL1.1.1 NOTEST *********/
md = EVP_MD_CTX_new();
if (md == NULL)
goto error;
@@ -515,7 +514,6 @@
int mdsz = EVP_MD_size(evp_md);
u_char *digest = malloc(roundup(need, mdsz));
- /********* OPENSSL1.1.1 NOTEST *********/
md = EVP_MD_CTX_new();
if (md == NULL)
goto skip;
Modified: branches/openssl_1_1_1_v2/ttssh2/ttxssh/ttxssh.c
===================================================================
--- branches/openssl_1_1_1_v2/ttssh2/ttxssh/ttxssh.c 2019-07-17 15:37:28 UTC (rev 7857)
+++ branches/openssl_1_1_1_v2/ttssh2/ttxssh/ttxssh.c 2019-07-18 14:47:19 UTC (rev 7858)
@@ -145,7 +145,6 @@
ssh_heartbeat_lock_initialize();
- /********* OPENSSL1.1.1 NOTEST *********/
pvar->evpcip[MODE_IN] = EVP_CIPHER_CTX_new();
pvar->evpcip[MODE_OUT] = EVP_CIPHER_CTX_new();
/*** TODO: OPENSSL1.1.1 ERROR CHECK ***/
@@ -181,7 +180,6 @@
ssh_heartbeat_lock_finalize();
- /********* OPENSSL1.1.1 NOTEST *********/
EVP_CIPHER_CTX_free(pvar->evpcip[MODE_IN]);
EVP_CIPHER_CTX_free(pvar->evpcip[MODE_OUT]);
}
@@ -4230,7 +4228,6 @@
buffer_free(encoded);
buffer_free(blob);
- /********* OPENSSL1.1.1 NOTEST *********/
if (cipher_ctx) {
EVP_CIPHER_CTX_free(cipher_ctx);
}
@@ -4433,6 +4430,13 @@
// set focus to passphrase edit control (2007.1.27 maya)
SetFocus(GetDlgItem(dlg, IDC_KEY_EDIT));
+
+ } else {
+ // generate_ssh_key()\x82\xAA\x8E\xB8\x94s\x82\xB5\x82\xBD\x8Fꍇ\x82ɂ\xA8\x82\xA2\x82Ă\xE0\x81A\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0
+ // \x83N\x83\x8D\x81[\x83Y\x82ł\xAB\x82\xE9\x82悤\x82ɂ\xB5\x82Ă\xA8\x82\xAD\x81B
+ EnableWindow(GetDlgItem(dlg, IDOK), TRUE);
+ EnableWindow(GetDlgItem(dlg, IDCANCEL), TRUE);
+
}
return TRUE;
}