Tera TermRevision: 7881
https://osdn.net/projects/ttssh2/scm/svn/commits/7881
Author: yutakapon
Date: 2019-07-23 22:31:37 +0900 (Tue, 23 Jul 2019)
Log Message:
-----------
単体テスト完了した箇所のコメントを除去した。
dh_new_group_asc()でDH構造体にポイントをセットし直せていなかった問題を修正した。
チケット #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/ssh.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-23 10:34:44 UTC (rev 7880)
+++ branches/openssl_1_1_1_v2/ttssh2/ttxssh/kex.c 2019-07-23 13:31:37 UTC (rev 7881)
@@ -33,7 +33,6 @@
static DH *dh_new_group_asc(const char *gen, const char *modulus)
{
- /********* OPENSSL1.1.1 NOTEST *********/
DH *dh = NULL;
BIGNUM *p, *g;
@@ -55,6 +54,9 @@
goto error;
}
+ // BN_hex2bn()\x82ŕϊ\xB7\x82\xB5\x82\xBD\x83|\x83C\x83\x93\x83^\x82\xF0DH\x8D\\x91\xA2\x91̂ɃZ\x83b\x83g\x82\xB7\x82\xE9\x81B
+ DH_set0_pqg(dh, p, NULL, g);
+
return (dh);
error:
@@ -296,7 +298,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;
Modified: branches/openssl_1_1_1_v2/ttssh2/ttxssh/ssh.c
===================================================================
--- branches/openssl_1_1_1_v2/ttssh2/ttxssh/ssh.c 2019-07-23 10:34:44 UTC (rev 7880)
+++ branches/openssl_1_1_1_v2/ttssh2/ttxssh/ssh.c 2019-07-23 13:31:37 UTC (rev 7881)
@@ -5366,7 +5366,6 @@
//
static void SSH2_dh_kex_init(PTInstVar pvar)
{
- /********* OPENSSL1.1.1 NOTEST *********/
DH *dh = NULL;
buffer_t *msg = NULL;
unsigned char *outmsg;
@@ -5844,7 +5843,6 @@
//
static BOOL handle_SSH2_dh_kex_reply(PTInstVar pvar)
{
- /********* OPENSSL1.1.1 NOTEST *********/
char *data;
int len;
int offset = 0;