svnno****@sourc*****
svnno****@sourc*****
2017年 6月 5日 (月) 17:48:49 JST
Tera TermRevision: 6771
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6771
Author: doda
Date: 2017-06-05 17:48:48 +0900 (Mon, 05 Jun 2017)
Log Message:
-----------
不用な条件判断およびコードを削除
Modified Paths:
--------------
trunk/ttssh2/ttxssh/pkt.c
trunk/ttssh2/ttxssh/ssh.c
-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/pkt.c
===================================================================
--- trunk/ttssh2/ttxssh/pkt.c 2017-06-05 08:39:19 UTC (rev 6770)
+++ trunk/ttssh2/ttxssh/pkt.c 2017-06-05 08:48:48 UTC (rev 6771)
@@ -205,17 +205,10 @@
//debug_print(10, data, pvar->pkt_state.datalen);
- // SSH2\x82Ȃ\xE7\x88Í\x86\x89\xBB\x83p\x83P\x83b\x83g\x82̈ꕔ\x82\x86\x89\xBB\x82\xB7\x82\xE9\x81B
+ // \x88Í\x86\x89\xBB\x83p\x83P\x83b\x83g\x82̈ꕔ\x82\x86\x89\xBB\x82\xB7\x82\xE9\x81B
if (!pvar->pkt_state.predecrypted_packet) {
- //DEBUG_PRINT_TO_FILE(0, data, pvar->pkt_state.datalen);
SSH_predecrpyt_packet(pvar, data);
-
- if (SSHv1(pvar)) {
- pvar->pkt_state.predecrypted_packet = TRUE;
- } else { // for SSH2(yutaka)
- // do nothing
- pvar->pkt_state.predecrypted_packet = TRUE;
- }
+ pvar->pkt_state.predecrypted_packet = TRUE;
}
if (SSHv1(pvar)) {
Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c 2017-06-05 08:39:19 UTC (rev 6770)
+++ trunk/ttssh2/ttxssh/ssh.c 2017-06-05 08:48:48 UTC (rev 6771)
@@ -2113,24 +2113,6 @@
{
unsigned char message = prep_packet(pvar, data, len, padding);
-
-#ifdef SSH2_DEBUG
- // for SSH2(yutaka)
- if (SSHv2(pvar)) {
- if (pvar->key_done) {
- message = message;
- }
-
- if (pvar->userauth_success) {
- message = message;
- }
-
- if (pvar->rekeying) {
- message = message;
- }
- }
-#endif
-
// SSH\x82̃\x81\x83b\x83Z\x81[\x83W\x83^\x83C\x83v\x82\xF0\x83`\x83F\x83b\x83N
if (message != SSH_MSG_NONE) {
// \x83\x81\x83b\x83Z\x81[\x83W\x83^\x83C\x83v\x82ɉ\x9E\x82\xB6\x82\xBD\x83n\x83\x93\x83h\x83\x89\x82\xF0\x8BN\x93\xAE