[Ttssh2-commit] [7895] 単体テスト完了した箇所のコメントを除去した。

scmno****@osdn***** scmno****@osdn*****
2019年 7月 29日 (月) 20:19:53 JST


Revision: 7895
          https://osdn.net/projects/ttssh2/scm/svn/commits/7895
Author:   yutakapon
Date:     2019-07-29 20:19:53 +0900 (Mon, 29 Jul 2019)
Log Message:
-----------
単体テスト完了した箇所のコメントを除去した。
3des-ctrはDropbearで動作確認。
camellia128-ctrはOpenSSHにパッチを適用して動作確認。
チケット #36876 

Ticket Links:
------------
    https://osdn.net/projects/ttssh2/tracker/detail/36876

Modified Paths:
--------------
    branches/openssl_1_1_1_v2/ttssh2/ttxssh/cipher-ctr.c
    branches/openssl_1_1_1_v2/ttssh2/ttxssh/ssh.c
    branches/openssl_1_1_1_v2/ttssh2/ttxssh/ttxssh.c

-------------- next part --------------
Modified: branches/openssl_1_1_1_v2/ttssh2/ttxssh/cipher-ctr.c
===================================================================
--- branches/openssl_1_1_1_v2/ttssh2/ttxssh/cipher-ctr.c	2019-07-29 07:11:39 UTC (rev 7894)
+++ branches/openssl_1_1_1_v2/ttssh2/ttxssh/cipher-ctr.c	2019-07-29 11:19:53 UTC (rev 7895)
@@ -212,25 +212,6 @@
 const EVP_CIPHER *
 evp_des3_ctr(void)
 {
-	/*** TODO: OPENSSL1.1.1 \x83e\x83X\x83g\x8A\xAE\x97\xB9\x8C\xE3\x82ɍ폜\x82\xB7\x82\xE9 ***/
-#if 0
-	static EVP_CIPHER des3_ctr;
-
-	memset(&des3_ctr, 0, sizeof(EVP_CIPHER));
-	des3_ctr.nid = NID_undef;
-	des3_ctr.block_size = DES_BLOCK_SIZE;
-	des3_ctr.iv_len = DES_BLOCK_SIZE;
-	des3_ctr.key_len = 24;
-	des3_ctr.init = ssh_des3_ctr_init;
-	des3_ctr.cleanup = ssh_des3_ctr_cleanup;
-	des3_ctr.do_cipher = ssh_des3_ctr;
-#ifndef SSH_OLD_EVP
-	des3_ctr.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV;
-#endif
-	return (&des3_ctr);
-#endif
-
-	/********* OPENSSL1.1.1 NOTEST *********/
 	static EVP_CIPHER *p = NULL;
 
 	if (p == NULL) {
@@ -543,25 +524,7 @@
 const EVP_CIPHER *
 evp_camellia_128_ctr(void)
 {
-	/*** TODO: OPENSSL1.1.1 \x83e\x83X\x83g\x8A\xAE\x97\xB9\x8C\xE3\x82ɍ폜\x82\xB7\x82\xE9 ***/
-#if 0
-	static EVP_CIPHER camellia_ctr;
 
-	memset(&camellia_ctr, 0, sizeof(EVP_CIPHER));
-	camellia_ctr.nid = NID_undef;
-	camellia_ctr.block_size = CAMELLIA_BLOCK_SIZE;
-	camellia_ctr.iv_len = CAMELLIA_BLOCK_SIZE;
-	camellia_ctr.key_len = 16;
-	camellia_ctr.init = ssh_camellia_ctr_init;
-	camellia_ctr.cleanup = ssh_camellia_ctr_cleanup;
-	camellia_ctr.do_cipher = ssh_camellia_ctr;
-#ifndef SSH_OLD_EVP
-	camellia_ctr.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV;
-#endif
-	return (&camellia_ctr);
-#endif
-
-	/********* OPENSSL1.1.1 NOTEST *********/
 	static EVP_CIPHER *p = NULL;
 
 	if (p == NULL) {

Modified: branches/openssl_1_1_1_v2/ttssh2/ttxssh/ssh.c
===================================================================
--- branches/openssl_1_1_1_v2/ttssh2/ttxssh/ssh.c	2019-07-29 07:11:39 UTC (rev 7894)
+++ branches/openssl_1_1_1_v2/ttssh2/ttxssh/ssh.c	2019-07-29 11:19:53 UTC (rev 7895)
@@ -2530,7 +2530,6 @@
 			}
 		}
 		else if (pvar->auth_state.cur_cred.method == SSH_AUTH_PAGEANT) {
-			/********* OPENSSL1.1.1 NOTEST *********/
 			int server_key_bits;
 			int host_key_bits;
 			int server_key_bytes;

Modified: branches/openssl_1_1_1_v2/ttssh2/ttxssh/ttxssh.c
===================================================================
--- branches/openssl_1_1_1_v2/ttssh2/ttxssh/ttxssh.c	2019-07-29 07:11:39 UTC (rev 7894)
+++ branches/openssl_1_1_1_v2/ttssh2/ttxssh/ttxssh.c	2019-07-29 11:19:53 UTC (rev 7895)
@@ -4619,7 +4619,6 @@
 			}
 
 			if (public_key.type == KEY_RSA1) { // SSH1 RSA
-				/********* OPENSSL1.1.1 NOTEST *********/
 				RSA *rsa = public_key.rsa;
 				int bits;
 				char *buf;


Ttssh2-commit メーリングリストの案内