Diff of /branches/ssh_chacha20poly1305/ttssh2/ttxssh/ssh.c

OSDN > Find Software > Tera Term

 Browse Subversion Repository



/[ttssh2]/branches/ssh_chacha20poly1305/ttssh2/ttxssh/ssh.c




Diff of /branches/ssh_chacha20poly1305/ttssh2/ttxssh/ssh.c



 Parent Directory

|  Revision Log



|  Patch














revision 5842 by yutakapon,
Fri May  1 07:39:45 2015 UTC




revision 5844 by yutakapon,
Fri May  1 13:06:54 2015 UTC






#

Line 4363 
 void SSH2_update_cipher_myproposal(PTIns


Line 4363 
 void SSH2_update_cipher_myproposal(PTIns












4363
                 strncat_s(buf, sizeof(buf), c_str, _TRUNCATE);
                 strncat_s(buf, sizeof(buf), c_str, _TRUNCATE);

















4364
         }
         }

















4365
         len = strlen(buf);
         len = strlen(buf);















4366


         buf[len - 1] = '\0';  // get rid of comma


         if (len > 0)













4367


 


                 buf[len - 1] = '\0';  // get rid of comma















4368
         myproposal[PROPOSAL_ENC_ALGS_CTOS] = buf;  // Client To Server
         myproposal[PROPOSAL_ENC_ALGS_CTOS] = buf;  // Client To Server

















4369
         myproposal[PROPOSAL_ENC_ALGS_STOC] = buf;  // Server To Client
         myproposal[PROPOSAL_ENC_ALGS_STOC] = buf;  // Server To Client

















4370
 }
 }











#

Line 4390 
 void SSH2_update_compression_myproposal(


Line 4391 
 void SSH2_update_compression_myproposal(












4391
                 strncat_s(buf, sizeof(buf), ",", _TRUNCATE);
                 strncat_s(buf, sizeof(buf), ",", _TRUNCATE);

















4392
         }
         }

















4393
         len = strlen(buf);
         len = strlen(buf);















4394


         buf[len - 1] = '\0';  // get rid of comma


         if (len > 0)













4395


 


                 buf[len - 1] = '\0';  // get rid of comma















4396
 
 

















4397
         // 圧縮指定がない場合は、圧縮レベルを無条件にゼロにする。
         // 圧縮指定がない場合は、圧縮レベルを無条件にゼロにする。

















4398
         if (buf[0] == '\0') {
         if (buf[0] == '\0') {











#

Line 4428 
 void SSH2_update_kex_myproposal(PTInstVa


Line 4430 
 void SSH2_update_kex_myproposal(PTInstVa












4430
                 strncat_s(buf, sizeof(buf), ",", _TRUNCATE);
                 strncat_s(buf, sizeof(buf), ",", _TRUNCATE);

















4431
         }
         }

















4432
         len = strlen(buf);
         len = strlen(buf);















4433


         buf[len - 1] = '\0';  // get rid of comma


         if (len > 0)













4434


 


                 buf[len - 1] = '\0';  // get rid of comma















4435
         myproposal[PROPOSAL_KEX_ALGS] = buf; 
         myproposal[PROPOSAL_KEX_ALGS] = buf; 

















4436
 }
 }

















4437
 
 











#

Line 4481 
 void SSH2_update_hmac_myproposal(PTInstV


Line 4484 
 void SSH2_update_hmac_myproposal(PTInstV












4484
                 strncat_s(buf, sizeof(buf), ",", _TRUNCATE);
                 strncat_s(buf, sizeof(buf), ",", _TRUNCATE);

















4485
         }
         }

















4486
         len = strlen(buf);
         len = strlen(buf);















4487


         buf[len - 1] = '\0';  // get rid of comma


         if (len > 0)













4488


 


                 buf[len - 1] = '\0';  // get rid of comma















4489
         myproposal[PROPOSAL_MAC_ALGS_CTOS] = buf; 
         myproposal[PROPOSAL_MAC_ALGS_CTOS] = buf; 

















4490
         myproposal[PROPOSAL_MAC_ALGS_STOC] = buf; 
         myproposal[PROPOSAL_MAC_ALGS_STOC] = buf; 

















4491
 }
 }





























Legend:



Removed from v.5842
 


changed lines


 
Added in v.5844













Back to OSDN">Back to OSDN
ViewVC Help


Powered by ViewVC 1.1.26
 /[ttssh2]/branches/ssh_chacha20poly1305/ttssh2/ttxssh/ssh.c
-revision 5842 by yutakapon,
Fri May  1 07:39:45 2015 UTC
+revision 5844 by yutakapon,
Fri May  1 13:06:54 2015 UTC
 Line 4363 
 void SSH2_update_cipher_myproposal(PTIns
                  strncat_s(buf, sizeof(buf), c_str, _TRUNCATE);
          }
          len = strlen(buf);
-         buf[len - 1] = '\0';  // get rid of comma
+         if (len > 0)
+                 buf[len - 1] = '\0';  // get rid of comma
          myproposal[PROPOSAL_ENC_ALGS_CTOS] = buf;  // Client To Server
          myproposal[PROPOSAL_ENC_ALGS_STOC] = buf;  // Server To Client
  }
-Line 4390 
 void SSH2_update_compression_myproposal(
+Line 4391 
 void SSH2_update_compression_myproposal(
                  strncat_s(buf, sizeof(buf), ",", _TRUNCATE);
          }
          len = strlen(buf);
-         buf[len - 1] = '\0';  // get rid of comma
+         if (len > 0)
+                 buf[len - 1] = '\0';  // get rid of comma
          // 圧縮指定がない場合は、圧縮レベルを無条件にゼロにする。
          if (buf[0] == '\0') {
-Line 4428 
 void SSH2_update_kex_myproposal(PTInstVa
+Line 4430 
 void SSH2_update_kex_myproposal(PTInstVa
                  strncat_s(buf, sizeof(buf), ",", _TRUNCATE);
          }
          len = strlen(buf);
-         buf[len - 1] = '\0';  // get rid of comma
+         if (len > 0)
+                 buf[len - 1] = '\0';  // get rid of comma
          myproposal[PROPOSAL_KEX_ALGS] = buf;
  }
-Line 4481 
 void SSH2_update_hmac_myproposal(PTInstV
+Line 4484 
 void SSH2_update_hmac_myproposal(PTInstV
                  strncat_s(buf, sizeof(buf), ",", _TRUNCATE);
          }
          len = strlen(buf);
-         buf[len - 1] = '\0';  // get rid of comma
+         if (len > 0)
+                 buf[len - 1] = '\0';  // get rid of comma
          myproposal[PROPOSAL_MAC_ALGS_CTOS] = buf;
          myproposal[PROPOSAL_MAC_ALGS_STOC] = buf;
  }
 Legend:



Removed from v.5842
 


changed lines


 
Added in v.5844
 Legend:



Removed from v.5842
 


changed lines


 
Added in v.5844
-Removed from v.5842
+Added in v.5844
-Back to OSDN">Back to OSDN
+ViewVC Help
 Powered by ViewVC 1.1.26

Develop and Download Open Source Software

Tera Term

Browse Subversion Repository