OSDN > Finden Software > Terminals > Serial > Tera Term > SCM > SVN > Commit

Tera Term

ttssh2: Commit

EVP_CIPHER_CTX 構造体のメンバーアクセスを関数化した。

encrypt -> EVP_CIPHER_CTX_encrypting に変更。
iv -> EVP_CIPHER_CTX_iv_noconst, EVP_CIPHER_CTX_iv に変更。

チケット #36876

--- branches/openssl_1_1_1_v2/ttssh2/ttxssh/ttxssh.c (revision 7800)

+++ branches/openssl_1_1_1_v2/ttssh2/ttxssh/ttxssh.c (revision 7801)

		@@ -3621,8 +3621,9 @@
3621	3621	}
3622	3622	if (key == NULL)
3623	3623	return (1);
	3624	+ /******* OPENSSL1.1.1 NOTEST *******/
3624	3625	if (enc == -1)
3625		- enc = ctx->encrypt;
	3626	+ enc = EVP_CIPHER_CTX_encrypting(ctx); // ctx->encrypt
3626	3627	k1 = k2 = k3 = (u_char *) key;
3627	3628	k2 += 8;
3628	3629	if (EVP_CIPHER_CTX_key_length(ctx) >= 16+8) {

		@@ -3691,16 +3692,17 @@
3691	3692	//fatal("%s: no 3des context", __func__);
3692	3693	;
3693	3694
	3695	+ /******* OPENSSL1.1.1 NOTEST *******/
3694	3696	if (doset) {
3695	3697	//debug3("%s: Installed 3DES IV", __func__);
3696		- memcpy(c->k1.iv, iv, 8);
3697		- memcpy(c->k2.iv, iv + 8, 8);
3698		- memcpy(c->k3.iv, iv + 16, 8);
	3698	+ memcpy(EVP_CIPHER_CTX_iv_noconst(c->k1), iv, 8);
	3699	+ memcpy(EVP_CIPHER_CTX_iv_noconst(c->k2), iv + 8, 8);
	3700	+ memcpy(EVP_CIPHER_CTX_iv_noconst(c->k3), iv + 16, 8);
3699	3701	} else {
3700	3702	//debug3("%s: Copying 3DES IV", __func__);
3701		- memcpy(iv, c->k1.iv, 8);
3702		- memcpy(iv + 8, c->k2.iv, 8);
3703		- memcpy(iv + 16, c->k3.iv, 8);
	3703	+ memcpy(iv, EVP_CIPHER_CTX_iv(c->k1), 8);
	3704	+ memcpy(iv + 8, EVP_CIPHER_CTX_iv(c->k2), 8);
	3705	+ memcpy(iv + 16, EVP_CIPHER_CTX_iv(c->k3), 8);
3704	3706	}
3705	3707	}
3706	3708