Imported Upstream version 4.5.2

2 files changed, 9 insertions, 4 deletions

diff --git a/src/libstrongswan/credentials/cred_encoding.c b/src/libstrongswan/credentials/cred_encoding.c
index edd76205b..ac3266f4c 100644
--- a/src/libstrongswan/credentials/cred_encoding.c
+++ b/src/libstrongswan/credentials/cred_encoding.c
@@ -180,8 +180,13 @@ static bool encode(private_cred_encoding_t *this, cred_encoding_type_t type,
 		chunk = malloc_thing(chunk_t);
 		*chunk = *encoding;
 		this->lock->write_lock(this->lock);
-		this->cache[type]->put(this->cache[type], cache, chunk);
+		chunk = this->cache[type]->put(this->cache[type], cache, chunk);
 		this->lock->unlock(this->lock);
+		if (chunk)
+		{
+			free(chunk->ptr);
+			free(chunk);
+		}
 	}
 	return success;
 }
diff --git a/src/libstrongswan/credentials/ietf_attributes/ietf_attributes.c b/src/libstrongswan/credentials/ietf_attributes/ietf_attributes.c
index de5b85bae..fecc9910e 100644
--- a/src/libstrongswan/credentials/ietf_attributes/ietf_attributes.c
+++ b/src/libstrongswan/credentials/ietf_attributes/ietf_attributes.c
@@ -189,11 +189,11 @@ static char* get_string(private_ietf_attributes_t *this)
 
 					if (oid == OID_UNKNOWN)
 					{
-						written = snprintf(pos, len, "0x#B", &attr->value);
+						written = snprintf(pos, len, "0x%#B", &attr->value);
 					}
 					else
 					{
-						written = snprintf(pos, len, "%s", oid_names[oid]);
+						written = snprintf(pos, len, "%s", oid_names[oid].name);
 					}
 					break;
 				}
@@ -331,7 +331,7 @@ static bool matches(private_ietf_attributes_t *this, private_ietf_attributes_t *
 	/* look for at least one common attribute */
 	while (TRUE)
 	{
-		bool cmp = attr_a->compare(attr_a, attr_b);
+		int cmp = attr_a->compare(attr_a, attr_b);
 
 		if (cmp == 0)
 		{