diff options
Diffstat (limited to 'src/libstrongswan/plugins/blowfish/blowfish_plugin.c')
| -rw-r--r-- | src/libstrongswan/plugins/blowfish/blowfish_plugin.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/libstrongswan/plugins/blowfish/blowfish_plugin.c b/src/libstrongswan/plugins/blowfish/blowfish_plugin.c index 6ab093d7b..03f46a63a 100644 --- a/src/libstrongswan/plugins/blowfish/blowfish_plugin.c +++ b/src/libstrongswan/plugins/blowfish/blowfish_plugin.c @@ -19,6 +19,11 @@ #include <library.h> #include "blowfish_crypter.h" +<<<<<<< HEAD +======= +static const char *plugin_name = "blowfish"; + +>>>>>>> upstream/4.5.1 typedef struct private_blowfish_plugin_t private_blowfish_plugin_t; /** @@ -55,7 +60,11 @@ plugin_t *blowfish_plugin_create() }, ); +<<<<<<< HEAD lib->crypto->add_crypter(lib->crypto, ENCR_BLOWFISH, +======= + lib->crypto->add_crypter(lib->crypto, ENCR_BLOWFISH, plugin_name, +>>>>>>> upstream/4.5.1 (crypter_constructor_t)blowfish_crypter_create); return &this->public.plugin; |