From 5b0bcfb1fc4aabb6535db91e70f7f262328e664f Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Thu, 21 Apr 2011 13:21:26 +0200 Subject: Revert alloc_str changes This reverts commit fdead26ffe1da8501a6ff5e0639a6f44c723e763. This reverts commit 3e2419ebe32de72d824864eb2e0e677a7c197af1. This reverts commit 17ce69b47a1efd6234960cf7d1f50712aee61db5. --- src/libtls/tls_crypto.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/libtls/tls_crypto.c') diff --git a/src/libtls/tls_crypto.c b/src/libtls/tls_crypto.c index fb0373bec..b000f9d47 100644 --- a/src/libtls/tls_crypto.c +++ b/src/libtls/tls_crypto.c @@ -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); } } -- cgit v1.2.3