Imported Upstream version 4.5.2

5 files changed, 33 insertions, 27 deletions

diff --git a/src/libstrongswan/utils/backtrace.c b/src/libstrongswan/utils/backtrace.c
index 41224e8c2..5744439f8 100644
--- a/src/libstrongswan/utils/backtrace.c
+++ b/src/libstrongswan/utils/backtrace.c
@@ -80,7 +80,7 @@ static void log_(private_backtrace_t *this, FILE *file, bool detailed)
 			}
 			if (info.dli_sname)
 			{
-				fprintf(file, "  \e[33m%s\e[0m @ %p (\e[31m%s\e[0m+0x%x) [%p]\n",
+				fprintf(file, "  \e[33m%s\e[0m @ %p (\e[31m%s\e[0m+0x%tx) [%p]\n",
 						info.dli_fname, info.dli_fbase, info.dli_sname,
 						this->frames[i] - info.dli_saddr, this->frames[i]);
 			}
diff --git a/src/libstrongswan/utils/host.c b/src/libstrongswan/utils/host.c
index ffeebd05c..615d85c95 100644
--- a/src/libstrongswan/utils/host.c
+++ b/src/libstrongswan/utils/host.c
@@ -625,5 +625,6 @@ host_t *host_create_any(int family)
 		default:
 			break;
 	}
+	free(this);
 	return NULL;
 }
diff --git a/src/libstrongswan/utils/identification.c b/src/libstrongswan/utils/identification.c
index fd2716deb..252cfa28e 100644
--- a/src/libstrongswan/utils/identification.c
+++ b/src/libstrongswan/utils/identification.c
@@ -64,32 +64,34 @@ typedef struct {
 } x501rdn_t;
 
 static const x501rdn_t x501rdns[] = {
-	{"ND", 				OID_NAME_DISTINGUISHER,		ASN1_PRINTABLESTRING},
-	{"UID", 			OID_PILOT_USERID,			ASN1_PRINTABLESTRING},
-	{"DC", 				OID_PILOT_DOMAIN_COMPONENT, ASN1_PRINTABLESTRING},
-	{"CN",				OID_COMMON_NAME,			ASN1_PRINTABLESTRING},
-	{"S", 				OID_SURNAME,				ASN1_PRINTABLESTRING},
-	{"SN", 				OID_SERIAL_NUMBER,			ASN1_PRINTABLESTRING},
-	{"serialNumber", 	OID_SERIAL_NUMBER,			ASN1_PRINTABLESTRING},
-	{"C", 				OID_COUNTRY,				ASN1_PRINTABLESTRING},
-	{"L", 				OID_LOCALITY,				ASN1_PRINTABLESTRING},
-	{"ST",				OID_STATE_OR_PROVINCE,		ASN1_PRINTABLESTRING},
-	{"O", 				OID_ORGANIZATION,			ASN1_PRINTABLESTRING},
-	{"OU", 				OID_ORGANIZATION_UNIT,		ASN1_PRINTABLESTRING},
-	{"T", 				OID_TITLE,					ASN1_PRINTABLESTRING},
-	{"D", 				OID_DESCRIPTION,			ASN1_PRINTABLESTRING},
-	{"N", 				OID_NAME,					ASN1_PRINTABLESTRING},
-	{"G", 				OID_GIVEN_NAME,				ASN1_PRINTABLESTRING},
-	{"I", 				OID_INITIALS,				ASN1_PRINTABLESTRING},
-	{"ID", 				OID_UNIQUE_IDENTIFIER,		ASN1_PRINTABLESTRING},
-	{"EN", 				OID_EMPLOYEE_NUMBER,		ASN1_PRINTABLESTRING},
-	{"employeeNumber",	OID_EMPLOYEE_NUMBER,		ASN1_PRINTABLESTRING},
-	{"E", 				OID_EMAIL_ADDRESS,			ASN1_IA5STRING},
-	{"Email", 			OID_EMAIL_ADDRESS,			ASN1_IA5STRING},
-	{"emailAddress",	OID_EMAIL_ADDRESS,			ASN1_IA5STRING},
-	{"UN", 				OID_UNSTRUCTURED_NAME,		ASN1_IA5STRING},
-	{"unstructuredName",OID_UNSTRUCTURED_NAME,		ASN1_IA5STRING},
-	{"TCGID", 			OID_TCGID,					ASN1_PRINTABLESTRING}
+	{"ND", 					OID_NAME_DISTINGUISHER,		ASN1_PRINTABLESTRING},
+	{"UID", 				OID_PILOT_USERID,			ASN1_PRINTABLESTRING},
+	{"DC", 					OID_PILOT_DOMAIN_COMPONENT, ASN1_PRINTABLESTRING},
+	{"CN",					OID_COMMON_NAME,			ASN1_PRINTABLESTRING},
+	{"S", 					OID_SURNAME,				ASN1_PRINTABLESTRING},
+	{"SN", 					OID_SERIAL_NUMBER,			ASN1_PRINTABLESTRING},
+	{"serialNumber", 		OID_SERIAL_NUMBER,			ASN1_PRINTABLESTRING},
+	{"C", 					OID_COUNTRY,				ASN1_PRINTABLESTRING},
+	{"L", 					OID_LOCALITY,				ASN1_PRINTABLESTRING},
+	{"ST",					OID_STATE_OR_PROVINCE,		ASN1_PRINTABLESTRING},
+	{"O", 					OID_ORGANIZATION,			ASN1_PRINTABLESTRING},
+	{"OU", 					OID_ORGANIZATION_UNIT,		ASN1_PRINTABLESTRING},
+	{"T", 					OID_TITLE,					ASN1_PRINTABLESTRING},
+	{"D", 					OID_DESCRIPTION,			ASN1_PRINTABLESTRING},
+	{"N", 					OID_NAME,					ASN1_PRINTABLESTRING},
+	{"G", 					OID_GIVEN_NAME,				ASN1_PRINTABLESTRING},
+	{"I", 					OID_INITIALS,				ASN1_PRINTABLESTRING},
+	{"ID", 					OID_UNIQUE_IDENTIFIER,		ASN1_PRINTABLESTRING},
+	{"EN", 					OID_EMPLOYEE_NUMBER,		ASN1_PRINTABLESTRING},
+	{"employeeNumber",		OID_EMPLOYEE_NUMBER,		ASN1_PRINTABLESTRING},
+	{"E",					OID_EMAIL_ADDRESS,			ASN1_IA5STRING},
+	{"Email", 				OID_EMAIL_ADDRESS,			ASN1_IA5STRING},
+	{"emailAddress",		OID_EMAIL_ADDRESS,			ASN1_IA5STRING},
+	{"UN",					OID_UNSTRUCTURED_NAME,		ASN1_IA5STRING},
+	{"unstructuredName",	OID_UNSTRUCTURED_NAME,		ASN1_IA5STRING},
+	{"UA",					OID_UNSTRUCTURED_ADDRESS,	ASN1_PRINTABLESTRING},
+	{"unstructuredAddress", OID_UNSTRUCTURED_ADDRESS,	ASN1_PRINTABLESTRING},
+	{"TCGID", 				OID_TCGID,					ASN1_PRINTABLESTRING}
 };
 
 /**
diff --git a/src/libstrongswan/utils/leak_detective.c b/src/libstrongswan/utils/leak_detective.c
index 52e92951b..39505d3f3 100644
--- a/src/libstrongswan/utils/leak_detective.c
+++ b/src/libstrongswan/utils/leak_detective.c
@@ -165,6 +165,7 @@ char *whitelist[] = {
 	"__gmtime_r",
 	"localtime_r",
 	"tzset",
+	"time_printf_hook",
 	"inet_ntoa",
 	"strerror",
 	"getprotobyname",
@@ -190,6 +191,7 @@ char *whitelist[] = {
 	"dlopen",
 	"dlerror",
 	"dlclose",
+	"dlsym",
 	/* mysql functions */
 	"mysql_init_character_set",
 	"init_client_errs",
diff --git a/src/libstrongswan/utils/linked_list.c b/src/libstrongswan/utils/linked_list.c
index 4aa8ea6ca..9b37359dc 100644
--- a/src/libstrongswan/utils/linked_list.c
+++ b/src/libstrongswan/utils/linked_list.c
@@ -289,6 +289,7 @@ static void insert_before(private_iterator_t * iterator, void *item)
 	if (iterator->current == NULL)
 	{
 		iterator->list->public.insert_first(&(iterator->list->public), item);
+		return;
 	}
 
 	element_t *element = element_create(item);