denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use centralized hasher names in coupling plugin

Browse Source
This commit is contained in:
Martin Willi
2012-07-17 17:32:03 +02:00
parent 610f90a8b9
commit 6719889e0a
1 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/coupling/coupling_validator.c
+2 -20
View File
@@ -199,17 +199,6 @@ coupling_validator_t *coupling_validator_create()
{ {
private_coupling_validator_t *this; private_coupling_validator_t *this;
char *path, *hash; char *path, *hash;
int i;
struct {
hash_algorithm_t alg;
char *name;
} hash_types[] = {
{ HASH_MD5, "md5"},
{ HASH_SHA1, "sha1"},
{ HASH_SHA256, "sha256"},
{ HASH_SHA384, "sha384"},
{ HASH_SHA512, "sha512"},
};
INIT(this, INIT(this,
.public = { .public = {
@@ -227,15 +216,8 @@ coupling_validator_t *coupling_validator_create()
hash = lib->settings->get_str(lib->settings, hash = lib->settings->get_str(lib->settings,
"%s.plugins.coupling.hash", "sha1", "%s.plugins.coupling.hash", "sha1",
charon->name); charon->name);
for (i = 0; i < countof(hash_types); i++) this->hasher = lib->crypto->create_hasher(lib->crypto,
{ enum_from_name(hash_algorithm_short_names, hash));
if (strcaseeq(hash_types[i].name, hash))
{
this->hasher = lib->crypto->create_hasher(lib->crypto,
hash_types[i].alg);
break;
}
}
if (!this->hasher) if (!this->hasher)
{ {
DBG1(DBG_CFG, "unsupported coupling hash algorithm: %s", hash); DBG1(DBG_CFG, "unsupported coupling hash algorithm: %s", hash);