Tera TermRevision: 7811
https://osdn.net/projects/ttssh2/scm/svn/commits/7811
Author: yutakapon
Date: 2019-06-26 20:10:53 +0900 (Wed, 26 Jun 2019)
Log Message:
-----------
evp_aes_128_ctrの単体テスト完了。
チケット #36876
Ticket Links:
------------
https://osdn.net/projects/ttssh2/tracker/detail/36876
Modified Paths:
--------------
branches/openssl_1_1_1_v2/ttssh2/ttxssh/cipher-ctr.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-06-25 14:05:37 UTC (rev 7810)
+++ branches/openssl_1_1_1_v2/ttssh2/ttxssh/cipher-ctr.c 2019-06-26 11:10:53 UTC (rev 7811)
@@ -133,30 +133,11 @@
const EVP_CIPHER *
evp_aes_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 aes_ctr;
-
- memset(&aes_ctr, 0, sizeof(EVP_CIPHER));
- aes_ctr.nid = NID_undef;
- aes_ctr.block_size = AES_BLOCK_SIZE;
- aes_ctr.iv_len = AES_BLOCK_SIZE;
- aes_ctr.key_len = 16;
- aes_ctr.init = ssh_aes_ctr_init;
- aes_ctr.cleanup = ssh_aes_ctr_cleanup;
- aes_ctr.do_cipher = ssh_aes_ctr;
-#ifndef SSH_OLD_EVP
- aes_ctr.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV;
-#endif
- return (&aes_ctr);
-#endif
-
- /********* OPENSSL1.1.1 NOTEST *********/
static EVP_CIPHER *p = NULL;
if (p == NULL) {
p = EVP_CIPHER_meth_new(NID_undef, /*block_size*/AES_BLOCK_SIZE, /*key_len*/16);
- /*** TODO: OPENSSL1.1.1 ERROR CHECK ***/
+ /*** TODO: OPENSSL1.1.1 ERROR CHECK(ticket#39335\x82ŏ\x88\x92u\x97\\x92\xE8) ***/
}
if (p) {
EVP_CIPHER_meth_set_iv_length(p, AES_BLOCK_SIZE);