Tera TermRevision: 9694
https://osdn.net/projects/ttssh2/scm/svn/commits/9694
Author: nmaya
Date: 2022-01-17 00:50:48 +0900 (Mon, 17 Jan 2022)
Log Message:
-----------
LibreSSL には camellia-cbc の関数はあるが camellia-ctr の関数がないので、#ifdef で使い分ける
Modified Paths:
--------------
trunk/ttssh2/ttxssh/cipher.c
-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/cipher.c
===================================================================
--- trunk/ttssh2/ttxssh/cipher.c 2022-01-16 15:35:24 UTC (rev 9693)
+++ trunk/ttssh2/ttxssh/cipher.c 2022-01-16 15:50:48 UTC (rev 9694)
@@ -59,9 +59,15 @@
{SSH2_CIPHER_CAMELLIA128_CBC, "camellia128-cbc", 16, 16, 0, 0, 0, EVP_camellia_128_cbc}, // draft-kanno-secsh-camellia-02
{SSH2_CIPHER_CAMELLIA192_CBC, "camellia192-cbc", 16, 24, 0, 0, 0, EVP_camellia_192_cbc}, // draft-kanno-secsh-camellia-02
{SSH2_CIPHER_CAMELLIA256_CBC, "camellia256-cbc", 16, 32, 0, 0, 0, EVP_camellia_256_cbc}, // draft-kanno-secsh-camellia-02
+#ifndef LIBRESSL_VERSION_NUMBER
{SSH2_CIPHER_CAMELLIA128_CTR, "camellia128-ctr", 16, 16, 0, 0, 0, EVP_camellia_128_ctr}, // draft-kanno-secsh-camellia-02
{SSH2_CIPHER_CAMELLIA192_CTR, "camellia192-ctr", 16, 24, 0, 0, 0, EVP_camellia_192_ctr}, // draft-kanno-secsh-camellia-02
{SSH2_CIPHER_CAMELLIA256_CTR, "camellia256-ctr", 16, 32, 0, 0, 0, EVP_camellia_256_ctr}, // draft-kanno-secsh-camellia-02
+#else
+ {SSH2_CIPHER_CAMELLIA128_CTR, "camellia128-ctr", 16, 16, 0, 0, 0, evp_camellia_128_ctr}, // draft-kanno-secsh-camellia-02
+ {SSH2_CIPHER_CAMELLIA192_CTR, "camellia192-ctr", 16, 24, 0, 0, 0, evp_camellia_128_ctr}, // draft-kanno-secsh-camellia-02
+ {SSH2_CIPHER_CAMELLIA256_CTR, "camellia256-ctr", 16, 32, 0, 0, 0, evp_camellia_128_ctr}, // draft-kanno-secsh-camellia-02
+#endif
#ifdef WITH_CAMELLIA_PRIVATE
{SSH2_CIPHER_CAMELLIA128_CBC, "camel****@opens*****", 16, 16, 0, 0, 0, EVP_camellia_128_cbc},
{SSH2_CIPHER_CAMELLIA192_CBC, "camel****@opens*****", 16, 24, 0, 0, 0, EVP_camellia_192_cbc},