renamed ENCR_TWOFISH and ENCR_SERPENT to ENCR_TWOFISH_CBC and ENCR_SERPENT_CBC, respe...
authorAndreas Steffen <andreas.steffen@strongswan.org>
Thu, 14 May 2009 11:55:10 +0000 (13:55 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Thu, 14 May 2009 11:55:56 +0000 (13:55 +0200)
src/libstrongswan/crypto/crypters/crypter.c
src/libstrongswan/crypto/crypters/crypter.h
src/libstrongswan/plugins/serpent/serpent_plugin.c
src/libstrongswan/plugins/twofish/twofish_plugin.c

index e1a801e..76e988a 100644 (file)
@@ -46,12 +46,12 @@ ENUM_NEXT(encryption_algorithm_names, ENCR_CAMELLIA_CBC, ENCR_CAMELLIA_CCM_ICV16
        "CAMELLIA_CCM_ICV8",
        "CAMELLIA_CCM_ICV12",
        "CAMELLIA_CCM_ICV16");
-ENUM_NEXT(encryption_algorithm_names, ENCR_UNDEFINED, ENCR_TWOFISH, ENCR_CAMELLIA_CCM_ICV16,
+ENUM_NEXT(encryption_algorithm_names, ENCR_UNDEFINED, ENCR_TWOFISH_CBC, ENCR_CAMELLIA_CCM_ICV16,
        "UNDEFINED",
        "DES_ECB",
-       "SERPENT",
-       "TWOFISH");
-ENUM_END(encryption_algorithm_names, ENCR_TWOFISH);
+       "SERPENT_CBC",
+       "TWOFISH_CBC");
+ENUM_END(encryption_algorithm_names, ENCR_TWOFISH_CBC);
 
 /*
  * Described in header.
index e18bbc1..f2b18d3 100644 (file)
@@ -57,8 +57,8 @@ enum encryption_algorithm_t {
        ENCR_CAMELLIA_CCM_ICV16 = 27,
        ENCR_UNDEFINED =        1024,
     ENCR_DES_ECB =          1025,
-       ENCR_SERPENT =          1026,
-    ENCR_TWOFISH =          1027
+       ENCR_SERPENT_CBC =      1026,
+    ENCR_TWOFISH_CBC =      1027
 };
 
 /**
index 19fcc20..2f279bd 100644 (file)
@@ -51,7 +51,7 @@ plugin_t *plugin_create()
        
        this->public.plugin.destroy = (void(*)(plugin_t*))destroy;
        
-       lib->crypto->add_crypter(lib->crypto, ENCR_SERPENT,
+       lib->crypto->add_crypter(lib->crypto, ENCR_SERPENT_CBC,
                                                         (crypter_constructor_t)serpent_crypter_create);
        
        return &this->public.plugin;
index 49fb18d..6244059 100644 (file)
@@ -51,7 +51,7 @@ plugin_t *plugin_create()
        
        this->public.plugin.destroy = (void(*)(plugin_t*))destroy;
        
-       lib->crypto->add_crypter(lib->crypto, ENCR_TWOFISH,
+       lib->crypto->add_crypter(lib->crypto, ENCR_TWOFISH_CBC,
                                                         (crypter_constructor_t)twofish_crypter_create);
        
        return &this->public.plugin;