ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

support older gcrypt libraries not defining the CAMELLIA cipher

laforge/swu
Martin Willi 2009-06-16 14:23:32 +02:00
parent 24d7b25d21
commit 62d6da67dd
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.in
View File

@ -1015,6 +1015,13 @@ fi
if test x$gcrypt = xtrue; then
AM_PATH_LIBGCRYPT(,,[AC_MSG_ERROR([libgcrypt not found!])])
AC_MSG_CHECKING([gcrypt CAMELLIA cipher])
AC_TRY_COMPILE(
[#include <gcrypt.h>],
[enum gcry_cipher_algos alg = GCRY_CIPHER_CAMELLIA128;],
[AC_MSG_RESULT([yes]); AC_DEFINE([HAVE_GCRY_CIPHER_CAMELLIA])],
[AC_MSG_RESULT([no])]
)
fi
if test x$uci = xtrue; then

2
src/libstrongswan/plugins/gcrypt/gcrypt_crypter.c
View File

@ -180,6 +180,7 @@ gcrypt_crypter_t *gcrypt_crypter_create(encryption_algorithm_t algo,
case ENCR_CAMELLIA_CBC:
switch (key_size)
{
#ifdef HAVE_GCRY_CIPHER_CAMELLIA
case 16:
gcrypt_alg = GCRY_CIPHER_CAMELLIA128;
break;
@ -189,6 +190,7 @@ gcrypt_crypter_t *gcrypt_crypter_create(encryption_algorithm_t algo,
case 32:
gcrypt_alg = GCRY_CIPHER_CAMELLIA256;
break;
#endif /* HAVE_GCRY_CIPHER_CAMELLIA */
default:
return NULL;
}