• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Révision8256 (tree)
l'heure2019-10-05 17:12:22
Auteuryutakapon

Message de Log

擬似テストで修正確認を実施。
チケット #36876

Change Summary

Modification

--- branches/openssl_1_1_1_v2/ttssh2/ttxssh/cipher-ctr.c (revision 8255)
+++ branches/openssl_1_1_1_v2/ttssh2/ttxssh/cipher-ctr.c (revision 8256)
@@ -306,27 +306,8 @@
306306 const EVP_CIPHER *
307307 evp_bf_ctr(void)
308308 {
309- /*** TODO: OPENSSL1.1.1 テスト完了後に削除する ***/
310-#if 0
311- static EVP_CIPHER blowfish_ctr;
312-
313- memset(&blowfish_ctr, 0, sizeof(EVP_CIPHER));
314- blowfish_ctr.nid = NID_undef;
315- blowfish_ctr.block_size = BF_BLOCK;
316- blowfish_ctr.iv_len = BF_BLOCK;
317- blowfish_ctr.key_len = 16;
318- blowfish_ctr.init = ssh_bf_ctr_init;
319- blowfish_ctr.cleanup = ssh_bf_ctr_cleanup;
320- blowfish_ctr.do_cipher = ssh_bf_ctr;
321-#ifndef SSH_OLD_EVP
322- blowfish_ctr.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV;
323-#endif
324- return (&blowfish_ctr);
325-#endif
326-
327309 static EVP_CIPHER *p = NULL;
328310
329- /********* OPENSSL1.1.1 NOTEST *********/
330311 if (p == NULL) {
331312 p = EVP_CIPHER_meth_new(NID_undef, /*block_size*/BF_BLOCK, /*key_len*/16);
332313 /*** TODO: OPENSSL1.1.1 ERROR CHECK(ticket#39335で処置予定) ***/
@@ -419,25 +400,6 @@
419400 const EVP_CIPHER *
420401 evp_cast5_ctr(void)
421402 {
422- /*** TODO: OPENSSL1.1.1 テスト完了後に削除する ***/
423-#if 0
424- static EVP_CIPHER cast5_ctr;
425-
426- memset(&cast5_ctr, 0, sizeof(EVP_CIPHER));
427- cast5_ctr.nid = NID_undef;
428- cast5_ctr.block_size = CAST_BLOCK;
429- cast5_ctr.iv_len = CAST_BLOCK;
430- cast5_ctr.key_len = 16;
431- cast5_ctr.init = ssh_cast5_ctr_init;
432- cast5_ctr.cleanup = ssh_cast5_ctr_cleanup;
433- cast5_ctr.do_cipher = ssh_cast5_ctr;
434-#ifndef SSH_OLD_EVP
435- cast5_ctr.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV;
436-#endif
437- return (&cast5_ctr);
438-#endif
439-
440- /********* OPENSSL1.1.1 NOTEST *********/
441403 static EVP_CIPHER *p = NULL;
442404
443405 if (p == NULL) {
Afficher sur ancien navigateur de dépôt.