diff options
Diffstat (limited to 'src/libstrongswan/plugins/ccm/ccm_plugin.c')
| -rw-r--r-- | src/libstrongswan/plugins/ccm/ccm_plugin.c | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/src/libstrongswan/plugins/ccm/ccm_plugin.c b/src/libstrongswan/plugins/ccm/ccm_plugin.c index 5fc3b14d7..15c548e64 100644 --- a/src/libstrongswan/plugins/ccm/ccm_plugin.c +++ b/src/libstrongswan/plugins/ccm/ccm_plugin.c @@ -19,6 +19,11 @@ #include "ccm_aead.h" +<<<<<<< HEAD +======= +static const char *plugin_name = "ccm"; + +>>>>>>> upstream/4.5.1 typedef struct private_ccm_plugin_t private_ccm_plugin_t; /** @@ -47,11 +52,16 @@ METHOD(plugin_t, destroy, void, plugin_t *ccm_plugin_create() { private_ccm_plugin_t *this; +<<<<<<< HEAD +======= + crypter_t *crypter; +>>>>>>> upstream/4.5.1 INIT(this, .public.plugin.destroy = _destroy, ); +<<<<<<< HEAD lib->crypto->add_aead(lib->crypto, ENCR_AES_CCM_ICV8, (aead_constructor_t)ccm_aead_create); lib->crypto->add_aead(lib->crypto, ENCR_AES_CCM_ICV12, @@ -64,6 +74,30 @@ plugin_t *ccm_plugin_create() (aead_constructor_t)ccm_aead_create); lib->crypto->add_aead(lib->crypto, ENCR_CAMELLIA_CCM_ICV16, (aead_constructor_t)ccm_aead_create); +======= + crypter = lib->crypto->create_crypter(lib->crypto, ENCR_AES_CBC, 0); + if (crypter) + { + crypter->destroy(crypter); + lib->crypto->add_aead(lib->crypto, ENCR_AES_CCM_ICV8, plugin_name, + (aead_constructor_t)ccm_aead_create); + lib->crypto->add_aead(lib->crypto, ENCR_AES_CCM_ICV12, plugin_name, + (aead_constructor_t)ccm_aead_create); + lib->crypto->add_aead(lib->crypto, ENCR_AES_CCM_ICV16, plugin_name, + (aead_constructor_t)ccm_aead_create); + } + crypter = lib->crypto->create_crypter(lib->crypto, ENCR_CAMELLIA_CBC, 0); + if (crypter) + { + crypter->destroy(crypter); + lib->crypto->add_aead(lib->crypto, ENCR_CAMELLIA_CCM_ICV8, plugin_name, + (aead_constructor_t)ccm_aead_create); + lib->crypto->add_aead(lib->crypto, ENCR_CAMELLIA_CCM_ICV12, plugin_name, + (aead_constructor_t)ccm_aead_create); + lib->crypto->add_aead(lib->crypto, ENCR_CAMELLIA_CCM_ICV16, plugin_name, + (aead_constructor_t)ccm_aead_create); + } +>>>>>>> upstream/4.5.1 return &this->public.plugin; } |