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

botan: Fix build without AES and its modes

This commit is contained in:
Tobias Brunner 2018-10-25 14:21:38 +02:00
parent 3f960e38a1
commit 37ae912271
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libstrongswan/plugins/botan/botan_crypter.c
View File

@ -25,6 +25,10 @@
#include "botan_crypter.h"
#include <botan/build.h>
#if defined(BOTAN_HAS_AES) && defined(BOTAN_HAS_MODE_CBC)
#include <botan/ffi.h>
typedef struct private_botan_crypter_t private_botan_crypter_t;
@ -189,3 +193,5 @@ botan_crypter_t *botan_crypter_create(encryption_algorithm_t algo,
this->key = chunk_alloc(key_size);
return &this->public;
}
#endif

6
src/libstrongswan/plugins/botan/botan_plugin.c
View File

@ -103,6 +103,7 @@ METHOD(plugin_t, get_features, int,
#endif
/* crypters */
#if defined(BOTAN_HAS_AES) && defined(BOTAN_HAS_MODE_CBC)
PLUGIN_REGISTER(CRYPTER, botan_crypter_create),
#ifdef BOTAN_HAS_AES
#ifdef BOTAN_HAS_MODE_CBC
@ -110,9 +111,13 @@ METHOD(plugin_t, get_features, int,
PLUGIN_PROVIDE(CRYPTER, ENCR_AES_CBC, 24),
PLUGIN_PROVIDE(CRYPTER, ENCR_AES_CBC, 32),
#endif
#endif
#endif
/* AEAD */
#if (defined(BOTAN_HAS_AES) && \
(defined(BOTAN_HAS_AEAD_GCM) || defined(BOTAN_HAS_AEAD_CCM))) || \
defined(BOTAN_HAS_AEAD_CHACHA20_POLY1305)
PLUGIN_REGISTER(AEAD, botan_aead_create),
#ifdef BOTAN_HAS_AES
#ifdef BOTAN_HAS_AEAD_GCM
@ -140,6 +145,7 @@ METHOD(plugin_t, get_features, int,
#endif
#ifdef BOTAN_HAS_AEAD_CHACHA20_POLY1305
PLUGIN_PROVIDE(AEAD, ENCR_CHACHA20_POLY1305, 32),
#endif
#endif
/* hashers */