Register some less common AF_ALG ciphers (cast5, serpent, twofish, blowfish)

diff --git a/src/libstrongswan/plugins/af_alg/af_alg_crypter.c b/src/libstrongswan/plugins/af_alg/af_alg_crypter.c
index e7a46a7cfbd18e3762e9b9f0b038a6ebb621cd31..ea80374f0ea00066e0da08305b026007a3dd1585 100644 (file)
--- a/src/libstrongswan/plugins/af_alg/af_alg_crypter.c
+++ b/src/libstrongswan/plugins/af_alg/af_alg_crypter.c
@@ -79,6 +79,16 @@ static size_t lookup_alg(encryption_algorithm_t algo, char **name,
                {ENCR_CAMELLIA_CTR,     "rfc3686(ctr(camellia))",        1,     16,     20,      8,     },
                {ENCR_CAMELLIA_CTR,     "rfc3686(ctr(camellia))",        1,     24,     28,      8,     },
                {ENCR_CAMELLIA_CTR,     "rfc3686(ctr(camellia))",        1,     32,     36,      8,     },
+               {ENCR_CAST,                     "cbc(cast5)",                            8,     16,     16,      8,     },
+               {ENCR_BLOWFISH,         "cbc(blowfish)",                         8,     16,     16,      8,     },
+               {ENCR_BLOWFISH,         "cbc(blowfish)",                         8,     24,     24,      8,     },
+               {ENCR_BLOWFISH,         "cbc(blowfish)",                         8,     32,     32,      8,     },
+               {ENCR_SERPENT_CBC,      "cbc(serpent)",                         16,     16,     16,     16,     },
+               {ENCR_SERPENT_CBC,      "cbc(serpent)",                         16,     24,     24,     16,     },
+               {ENCR_SERPENT_CBC,      "cbc(serpent)",                         16,     32,     32,     16,     },
+               {ENCR_TWOFISH_CBC,      "cbc(twofish)",                         16,     16,     16,     16,     },
+               {ENCR_TWOFISH_CBC,      "cbc(twofish)",                         16,     24,     24,     16,     },
+               {ENCR_TWOFISH_CBC,      "cbc(twofish)",                         16,     32,     32,     16,     },
        };
        int i;
 

diff --git a/src/libstrongswan/plugins/af_alg/af_alg_plugin.c b/src/libstrongswan/plugins/af_alg/af_alg_plugin.c
index 01031d7a1027667a82389c078d6e473eeb6136a1..b8bbd26b88d7648b219e8d44aec506871264f771 100644 (file)
--- a/src/libstrongswan/plugins/af_alg/af_alg_plugin.c
+++ b/src/libstrongswan/plugins/af_alg/af_alg_plugin.c
@@ -134,6 +134,14 @@ plugin_t *af_alg_plugin_create()
                                        (crypter_constructor_t)af_alg_crypter_create);
        lib->crypto->add_crypter(lib->crypto, ENCR_CAMELLIA_CTR,
                                        (crypter_constructor_t)af_alg_crypter_create);
+       lib->crypto->add_crypter(lib->crypto, ENCR_CAST,
+                                       (crypter_constructor_t)af_alg_crypter_create);
+       lib->crypto->add_crypter(lib->crypto, ENCR_BLOWFISH,
+                                       (crypter_constructor_t)af_alg_crypter_create);
+       lib->crypto->add_crypter(lib->crypto, ENCR_SERPENT_CBC,
+                                       (crypter_constructor_t)af_alg_crypter_create);
+       lib->crypto->add_crypter(lib->crypto, ENCR_TWOFISH_CBC,
+                                       (crypter_constructor_t)af_alg_crypter_create);
 
        return &this->public.plugin;
 }