add _CBC to all encryption algorithms in CBC mode
authorAndreas Steffen <andreas.steffen@strongswan.org>
Tue, 19 May 2009 07:29:23 +0000 (09:29 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Tue, 19 May 2009 08:02:24 +0000 (10:02 +0200)
src/libstrongswan/crypto/crypters/crypter.c
src/pluto/constants.c

index 76e988a..fda2f45 100644 (file)
 
 ENUM_BEGIN(encryption_algorithm_names, ENCR_DES_IV64, ENCR_DES_IV32,
        "DES_IV64",
-       "DES",
-       "3DES",
-       "RC5",
-       "IDEA",
-       "CAST",
-       "BLOWFISH",
+       "DES_CBC",
+       "3DES_CBC",
+       "RC5_CBC",
+       "IDEA_CBC",
+       "CAST_CBC",
+       "BLOWFISH_CBC",
        "3IDEA",
        "DES_IV32");
 ENUM_NEXT(encryption_algorithm_names, ENCR_NULL, ENCR_AES_CCM_ICV16, ENCR_DES_IV32,
@@ -43,9 +43,9 @@ ENUM_NEXT(encryption_algorithm_names, ENCR_AES_GCM_ICV8, ENCR_NULL_AUTH_AES_GMAC
 ENUM_NEXT(encryption_algorithm_names, ENCR_CAMELLIA_CBC, ENCR_CAMELLIA_CCM_ICV16, ENCR_NULL_AUTH_AES_GMAC,
        "CAMELLIA_CBC",
        "CAMELLIA_CTR",
-       "CAMELLIA_CCM_ICV8",
-       "CAMELLIA_CCM_ICV12",
-       "CAMELLIA_CCM_ICV16");
+       "CAMELLIA_CCM_8",
+       "CAMELLIA_CCM_12",
+       "CAMELLIA_CCM_16");
 ENUM_NEXT(encryption_algorithm_names, ENCR_UNDEFINED, ENCR_TWOFISH_CBC, ENCR_CAMELLIA_CCM_ICV16,
        "UNDEFINED",
        "DES_ECB",
index 910842d..acf9d76 100644 (file)
@@ -374,12 +374,12 @@ enum_names ah_transformid_names =
 
 static const char *const esp_transform_name[] = {
        "DES_IV64",
-       "DES",
-       "3DES",
-       "RC5",
-       "IDEA",
-       "CAST",
-       "BLOWFISH",
+       "DES_CBC",
+       "3DES_CBC",
+       "RC5_CBC",
+       "IDEA_CBC",
+       "CAST_CBC",
+       "BLOWFISH_CBC",
        "3IDEA",
        "DES_IV32",
        "RC4",