diff options
Diffstat (limited to 'src/libstrongswan/plugins/aes/aes_plugin.c')
| -rw-r--r-- | src/libstrongswan/plugins/aes/aes_plugin.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/libstrongswan/plugins/aes/aes_plugin.c b/src/libstrongswan/plugins/aes/aes_plugin.c index 22b47e334..b859d3167 100644 --- a/src/libstrongswan/plugins/aes/aes_plugin.c +++ b/src/libstrongswan/plugins/aes/aes_plugin.c @@ -18,6 +18,11 @@ #include <library.h> #include "aes_crypter.h" +<<<<<<< HEAD +======= +static const char *plugin_name = "aes"; + +>>>>>>> upstream/4.5.1 typedef struct private_aes_plugin_t private_aes_plugin_t; /** @@ -54,7 +59,11 @@ plugin_t *aes_plugin_create() }, ); +<<<<<<< HEAD lib->crypto->add_crypter(lib->crypto, ENCR_AES_CBC, +======= + lib->crypto->add_crypter(lib->crypto, ENCR_AES_CBC, plugin_name, +>>>>>>> upstream/4.5.1 (crypter_constructor_t)aes_crypter_create); return &this->public.plugin; |