Tera Term

[ttssh2-commit] [9676] r9623 で削除した OpenSSL 1.1 以降用のコードを戻し、#ifdef で使い分ける

• 前の記事 (スレッド) [ttssh2-commit] [9675] ジェネレート時に使用するruntimeを指定するよう修正
• 次の記事 (スレッド) [ttssh2-commit] [9677] 生成される LibreSSL のランタイムをマルチスレッドにする方法を、CMakeCache.txt を書き換えるのではなく、cmake に引数を指定するようにした
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 9676
          https://osdn.net/projects/ttssh2/scm/svn/commits/9676
Author:   nmaya
Date:     2022-01-05 00:39:49 +0900 (Wed, 05 Jan 2022)
Log Message:
-----------
r9623 で削除した OpenSSL 1.1 以降用のコードを戻し、#ifdef で使い分ける

r9658 の不足分

merge from libressl_3_4_2_cmake:
r9673

Revision Links:
--------------
    https://osdn.net/projects/ttssh2/scm/svn/commits/9623
    https://osdn.net/projects/ttssh2/scm/svn/commits/9658
    https://osdn.net/projects/ttssh2/scm/svn/commits/9673

Modified Paths:
--------------
    branches/libressl_3_4_2/ttssh2/ttxssh/cipher-3des1.c

Property Changed:
----------------
    branches/libressl_3_4_2/
    branches/libressl_3_4_2/TTProxy/
    branches/libressl_3_4_2/TTXKanjiMenu/
    branches/libressl_3_4_2/TTXSamples/
    branches/libressl_3_4_2/cygterm/
    branches/libressl_3_4_2/teraterm/
    branches/libressl_3_4_2/ttpmenu/

-------------- next part --------------
Index: branches/libressl_3_4_2
===================================================================
--- branches/libressl_3_4_2	2022-01-04 14:11:05 UTC (rev 9675)
+++ branches/libressl_3_4_2	2022-01-04 15:39:49 UTC (rev 9676)

Property changes on: branches/libressl_3_4_2
___________________________________________________________________
Modified: svn:mergeinfo
## -1,6 +1,7 ##
 /branches/4-stable:8924,9256-9257
 /branches/drag_and_drop:7130,7139,7141,7143-7147
 /branches/flowctrl_dsrdtr:7825-7827
+/branches/libressl_3_4_2_cmake:9673
 /branches/move_code_script:9026-9185
 /branches/openssl_1_1_1_v2:7785-7786,7788-7808,7811-7812,7814-7815,7819-7822,7829,7832-7834,7838-7843,7846-7847,7855-7856,7858,7861-7863,7873-7877,7880-7881,7884-7888,7890-7892,7894-7895,7898,7900,7902-7903,7909,7924,7934,7954-7957,7959,7973,7975,7979-7980,8019,8208,8256
 /branches/openssl_1_1_1_v3:8258,8264-8265
Index: branches/libressl_3_4_2/TTProxy
===================================================================
--- branches/libressl_3_4_2/TTProxy	2022-01-04 14:11:05 UTC (rev 9675)
+++ branches/libressl_3_4_2/TTProxy	2022-01-04 15:39:49 UTC (rev 9676)

Property changes on: branches/libressl_3_4_2/TTProxy
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,5 ##
 /branches/4-stable/TTProxy:9256-9257
+/branches/libressl_3_4_2_cmake/TTProxy:9673
 /branches/openssl_1_1_1_v2/TTProxy:7785-7786,7788-7808,7861-7863,7898,7900,7902-7903,7909,7924,7934,7954-7957,7959,7973,7975,7979-7980
 /branches/openssl_1_1_1_v3/TTProxy:8258
 /branches/ssh_chacha20poly1305/TTProxy:9209-9212,9217,9229,9248-9253
Index: branches/libressl_3_4_2/TTXKanjiMenu
===================================================================
--- branches/libressl_3_4_2/TTXKanjiMenu	2022-01-04 14:11:05 UTC (rev 9675)
+++ branches/libressl_3_4_2/TTXKanjiMenu	2022-01-04 15:39:49 UTC (rev 9676)

Property changes on: branches/libressl_3_4_2/TTXKanjiMenu
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
 /branches/4-stable/TTXKanjiMenu:9256-9257
+/branches/libressl_3_4_2_cmake/TTXKanjiMenu:9673
 /branches/ssh_chacha20poly1305/TTXKanjiMenu:9209-9212,9217,9229,9248-9253
 /branches/vs2015_warn/TTXKanjiMenu:6194-6285
\ No newline at end of property
Index: branches/libressl_3_4_2/TTXSamples
===================================================================
--- branches/libressl_3_4_2/TTXSamples	2022-01-04 14:11:05 UTC (rev 9675)
+++ branches/libressl_3_4_2/TTXSamples	2022-01-04 15:39:49 UTC (rev 9676)

Property changes on: branches/libressl_3_4_2/TTXSamples
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
 /branches/4-stable/TTXSamples:9256-9257
+/branches/libressl_3_4_2_cmake/TTXSamples:9673
 /branches/ssh_chacha20poly1305/TTXSamples:9209-9212,9217,9229,9248-9253
 /branches/vs2015_warn/TTXSamples:6194-6285
\ No newline at end of property
Index: branches/libressl_3_4_2/cygterm
===================================================================
--- branches/libressl_3_4_2/cygterm	2022-01-04 14:11:05 UTC (rev 9675)
+++ branches/libressl_3_4_2/cygterm	2022-01-04 15:39:49 UTC (rev 9676)

Property changes on: branches/libressl_3_4_2/cygterm
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
 /branches/4-stable/cygterm:9256-9257
+/branches/libressl_3_4_2_cmake/cygterm:9673
 /branches/openssl_1_1_1_v3/cygterm:8284
 /branches/ssh_chacha20poly1305/cygterm:9209-9212,9217,9229,9248-9253
\ No newline at end of property
Index: branches/libressl_3_4_2/teraterm
===================================================================
--- branches/libressl_3_4_2/teraterm	2022-01-04 14:11:05 UTC (rev 9675)
+++ branches/libressl_3_4_2/teraterm	2022-01-04 15:39:49 UTC (rev 9676)

Property changes on: branches/libressl_3_4_2/teraterm
___________________________________________________________________
Modified: svn:mergeinfo
## -1,6 +1,7 ##
 /branches/4-stable/teraterm:8924,9256-9257
 /branches/drag_and_drop/teraterm:7130,7139,7141,7143-7147
 /branches/flowctrl_dsrdtr/teraterm:7825-7827
+/branches/libressl_3_4_2_cmake/teraterm:9673
 /branches/move_code_script/teraterm:9026-9185
 /branches/openssl_1_1_1_v2/teraterm:7819-7822,7829,7832-7834,7838-7843,7846-7847,7855-7856,7858,7861-7863,7979-7980
 /branches/openssl_1_1_1_v3/teraterm:8258
Index: branches/libressl_3_4_2/ttpmenu
===================================================================
--- branches/libressl_3_4_2/ttpmenu	2022-01-04 14:11:05 UTC (rev 9675)
+++ branches/libressl_3_4_2/ttpmenu	2022-01-04 15:39:49 UTC (rev 9676)

Property changes on: branches/libressl_3_4_2/ttpmenu
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
 /branches/4-stable/ttpmenu:9256-9257
+/branches/libressl_3_4_2_cmake/ttpmenu:9673
 /branches/ssh_chacha20poly1305/ttpmenu:9209-9212,9217,9229,9248-9253
 /branches/vs2015_warn/ttpmenu:6194-6285
\ No newline at end of property
Modified: branches/libressl_3_4_2/ttssh2/ttxssh/cipher-3des1.c
===================================================================
--- branches/libressl_3_4_2/ttssh2/ttxssh/cipher-3des1.c	2022-01-04 14:11:05 UTC (rev 9675)
+++ branches/libressl_3_4_2/ttssh2/ttxssh/cipher-3des1.c	2022-01-04 15:39:49 UTC (rev 9676)
@@ -125,6 +125,22 @@
 
 const EVP_CIPHER *evp_ssh1_3des(void)
 {
+#ifndef LIBRESSL_VERSION_NUMBER
+	static EVP_CIPHER *p = NULL;
+
+	if (p == NULL) {
+		p = EVP_CIPHER_meth_new(NID_undef, /*block_size*/8, /*key_len*/16);
+		/*** TODO: OPENSSL1.1.1 ERROR CHECK(ticket#39335\x82ŏ\x88\x92u\x97\\x92\xE8) ***/
+	}
+	if (p) {
+		EVP_CIPHER_meth_set_iv_length(p, 0);
+		EVP_CIPHER_meth_set_init(p, ssh1_3des_init);
+		EVP_CIPHER_meth_set_cleanup(p, ssh1_3des_cleanup);
+		EVP_CIPHER_meth_set_do_cipher(p, ssh1_3des_cbc);
+		EVP_CIPHER_meth_set_flags(p, EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH);
+	}
+	return (p);
+#else
 	static EVP_CIPHER ssh1_3des;
 
 	memset(&ssh1_3des, 0, sizeof(EVP_CIPHER));
@@ -137,4 +153,5 @@
 	ssh1_3des.do_cipher = ssh1_3des_cbc;
 	ssh1_3des.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH;
 	return (&ssh1_3des);
+#endif
 }

• 前の記事 (スレッド) [ttssh2-commit] [9675] ジェネレート時に使用するruntimeを指定するよう修正
• 次の記事 (スレッド) [ttssh2-commit] [9677] 生成される LibreSSL のランタイムをマルチスレッドにする方法を、CMakeCache.txt を書き換えるのではなく、cmake に引数を指定するようにした
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]