diff options
| author | Andreas Steffen <andreas.steffen@strongswan.org> | 2009-05-14 13:55:10 +0200 |
|---|---|---|
| committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2009-05-14 13:55:56 +0200 |
| commit | 0a8ad227d41243846a3e396614cb06d2048d6bf3 (patch) | |
| tree | 66fb090416750ac9f449bd22f04c64b1a7655f3d /src | |
| parent | 24400cf617ac8c0ade033de6d4de8c41fbf2a8c0 (diff) | |
| download | strongswan-0a8ad227d41243846a3e396614cb06d2048d6bf3.tar.bz2 strongswan-0a8ad227d41243846a3e396614cb06d2048d6bf3.tar.xz | |
renamed ENCR_TWOFISH and ENCR_SERPENT to ENCR_TWOFISH_CBC and ENCR_SERPENT_CBC, respectively
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstrongswan/crypto/crypters/crypter.c | 8 | ||||
| -rw-r--r-- | src/libstrongswan/crypto/crypters/crypter.h | 4 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/serpent/serpent_plugin.c | 2 | ||||
| -rw-r--r-- | src/libstrongswan/plugins/twofish/twofish_plugin.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/libstrongswan/crypto/crypters/crypter.c b/src/libstrongswan/crypto/crypters/crypter.c index e1a801ecd..76e988a8f 100644 --- a/src/libstrongswan/crypto/crypters/crypter.c +++ b/src/libstrongswan/crypto/crypters/crypter.c @@ -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. diff --git a/src/libstrongswan/crypto/crypters/crypter.h b/src/libstrongswan/crypto/crypters/crypter.h index e18bbc1f7..f2b18d3f8 100644 --- a/src/libstrongswan/crypto/crypters/crypter.h +++ b/src/libstrongswan/crypto/crypters/crypter.h @@ -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 }; /** diff --git a/src/libstrongswan/plugins/serpent/serpent_plugin.c b/src/libstrongswan/plugins/serpent/serpent_plugin.c index 19fcc2021..2f279bd20 100644 --- a/src/libstrongswan/plugins/serpent/serpent_plugin.c +++ b/src/libstrongswan/plugins/serpent/serpent_plugin.c @@ -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; diff --git a/src/libstrongswan/plugins/twofish/twofish_plugin.c b/src/libstrongswan/plugins/twofish/twofish_plugin.c index 49fb18dcd..624405971 100644 --- a/src/libstrongswan/plugins/twofish/twofish_plugin.c +++ b/src/libstrongswan/plugins/twofish/twofish_plugin.c @@ -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; |