Revert alloc_str changes

This reverts commit fdead26ffe.
This reverts commit 3e2419ebe3.
This reverts commit 17ce69b47a.
This commit is contained in:
Martin Willi
2011-04-21 13:35:31 +02:00
parent fdead26ffe
commit 5b0bcfb1fc
17 changed files with 49 additions and 123 deletions
+4 -8
View File
@@ -706,7 +706,7 @@ static void filter_key_exchange_config_suites(private_tls_crypto_t *this,
int i, remaining = 0;
char *token, *config;
config = lib->settings->alloc_str(lib->settings, "libtls.key_exchange", NULL);
config = lib->settings->get_str(lib->settings, "libtls.key_exchange", NULL);
if (config)
{
for (i = 0; i < *count; i++)
@@ -747,7 +747,6 @@ static void filter_key_exchange_config_suites(private_tls_crypto_t *this,
enumerator->destroy(enumerator);
}
*count = remaining;
free(config);
}
}
@@ -761,7 +760,7 @@ static void filter_cipher_config_suites(private_tls_crypto_t *this,
int i, remaining = 0;
char *token, *config;
config = lib->settings->alloc_str(lib->settings, "libtls.cipher", NULL);
config = lib->settings->get_str(lib->settings, "libtls.cipher", NULL);
if (config)
{
for (i = 0; i < *count; i++)
@@ -813,7 +812,6 @@ static void filter_cipher_config_suites(private_tls_crypto_t *this,
enumerator->destroy(enumerator);
}
*count = remaining;
free(config);
}
}
@@ -827,7 +825,7 @@ static void filter_mac_config_suites(private_tls_crypto_t *this,
int i, remaining = 0;
char *token, *config;
config = lib->settings->alloc_str(lib->settings, "libtls.mac", NULL);
config = lib->settings->get_str(lib->settings, "libtls.mac", NULL);
if (config)
{
for (i = 0; i < *count; i++)
@@ -863,7 +861,6 @@ static void filter_mac_config_suites(private_tls_crypto_t *this,
enumerator->destroy(enumerator);
}
*count = remaining;
free(config);
}
}
@@ -877,7 +874,7 @@ static void filter_specific_config_suites(private_tls_crypto_t *this,
int i, remaining = 0, suite;
char *token, *config;
config = lib->settings->alloc_str(lib->settings, "libtls.suites", NULL);
config = lib->settings->get_str(lib->settings, "libtls.suites", NULL);
if (config)
{
for (i = 0; i < *count; i++)
@@ -895,7 +892,6 @@ static void filter_specific_config_suites(private_tls_crypto_t *this,
enumerator->destroy(enumerator);
}
*count = remaining;
free(config);
}
}