Merge upstream version 4.5.2

1 files changed, 5 insertions, 107 deletions

diff --git a/src/libcharon/plugins/stroke/stroke_list.c b/src/libcharon/plugins/stroke/stroke_list.c
index 9c71b2cd2..6c42f8f8a 100644
--- a/src/libcharon/plugins/stroke/stroke_list.c
+++ b/src/libcharon/plugins/stroke/stroke_list.c
@@ -388,15 +388,8 @@ static void log_auth_cfgs(FILE *out, peer_cfg_t *peer_cfg, bool local)
 	enumerator->destroy(enumerator);
 }
 
-<<<<<<< HEAD
-/**
- * Implementation of stroke_list_t.status.
- */
-static void status(private_stroke_list_t *this, stroke_msg_t *msg, FILE *out, bool all)
-=======
 METHOD(stroke_list_t, status, void,
 	private_stroke_list_t *this, stroke_msg_t *msg, FILE *out, bool all)
->>>>>>> upstream/4.5.1
 {
 	enumerator_t *enumerator, *children;
 	ike_cfg_t *ike_cfg;
@@ -409,7 +402,8 @@ METHOD(stroke_list_t, status, void,
 	if (all)
 	{
 		peer_cfg_t *peer_cfg;
-		char *plugin, *pool;
+		plugin_t *plugin;
+		char *pool;
 		host_t *host;
 		u_int32_t dpd;
 		time_t since, now;
@@ -438,7 +432,7 @@ METHOD(stroke_list_t, status, void,
 		enumerator = lib->plugins->create_plugin_enumerator(lib->plugins);
 		while (enumerator->enumerate(enumerator, &plugin))
 		{
-			fprintf(out, "%s ", plugin);
+			fprintf(out, "%s ", plugin->get_name(plugin));
 		}
 		enumerator->destroy(enumerator);
 		fprintf(out, "\n");
@@ -761,11 +755,7 @@ static void stroke_list_certs(linked_list_t *list, char *label,
 			enumerator_t *enumerator;
 			identification_t *altName;
 			bool first_altName = TRUE;
-<<<<<<< HEAD
-			int pathlen;
-=======
 			u_int pathlen;
->>>>>>> upstream/4.5.1
 			chunk_t serial, authkey;
 			time_t notBefore, notAfter;
 			public_key_t *public;
@@ -845,17 +835,10 @@ static void stroke_list_certs(linked_list_t *list, char *label,
 			}
 
 			/* list optional pathLenConstraint */
-<<<<<<< HEAD
-			pathlen = x509->get_pathLenConstraint(x509);
-			if (pathlen != X509_NO_PATH_LEN_CONSTRAINT)
-			{
-				fprintf(out, "  pathlen:   %d\n", pathlen);
-=======
 			pathlen = x509->get_constraint(x509, X509_PATH_LEN);
 			if (pathlen != X509_NO_CONSTRAINT)
 			{
 				fprintf(out, "  pathlen:   %u\n", pathlen);
->>>>>>> upstream/4.5.1
 			}
 
 			/* list optional ipAddrBlocks */
@@ -995,13 +978,10 @@ static void stroke_list_crls(linked_list_t *list, bool utc, FILE *out)
 		{
 			fprintf(out, "  serial:    %#B\n", &chunk);
 		}
-<<<<<<< HEAD
-=======
 		if (crl->is_delta_crl(crl, &chunk))
 		{
 			fprintf(out, "  delta for: %#B\n", &chunk);
 		}
->>>>>>> upstream/4.5.1
 
 		/* count the number of revoked certificates */
 		{
@@ -1083,8 +1063,6 @@ static void stroke_list_ocsp(linked_list_t* list, bool utc, FILE *out)
 }
 
 /**
-<<<<<<< HEAD
-=======
  * Print the name of an algorithm plus the name of the plugin that registered it
  */
 static void print_alg(FILE *out, int *len, enum_name_t *alg_names, int alg_type,
@@ -1092,19 +1070,18 @@ static void print_alg(FILE *out, int *len, enum_name_t *alg_names, int alg_type,
 {
 	char alg_name[BUF_LEN];
 	int alg_name_len;
-	
+
 	alg_name_len = sprintf(alg_name, " %N[%s]", alg_names, alg_type, plugin_name);
 	if (*len + alg_name_len > CRYPTO_MAX_ALG_LINE)
 	{
 		fprintf(out, "\n             ");
-		*len = 13;	
+		*len = 13;
 	}
 	fprintf(out, "%s", alg_name);
 	*len += alg_name_len;
 }
 
 /**
->>>>>>> upstream/4.5.1
  * List of registered cryptographical algorithms
  */
 static void list_algs(FILE *out)
@@ -1115,51 +1092,6 @@ static void list_algs(FILE *out)
 	hash_algorithm_t hash;
 	pseudo_random_function_t prf;
 	diffie_hellman_group_t group;
-<<<<<<< HEAD
-
-	fprintf(out, "\n");
-	fprintf(out, "List of registered IKEv2 Algorithms:\n");
-	fprintf(out, "\n  encryption: ");
-	enumerator = lib->crypto->create_crypter_enumerator(lib->crypto);
-	while (enumerator->enumerate(enumerator, &encryption))
-	{
-		fprintf(out, "%N ", encryption_algorithm_names, encryption);
-	}
-	enumerator->destroy(enumerator);
-	fprintf(out, "\n  integrity:  ");
-	enumerator = lib->crypto->create_signer_enumerator(lib->crypto);
-	while (enumerator->enumerate(enumerator, &integrity))
-	{
-		fprintf(out, "%N ", integrity_algorithm_names, integrity);
-	}
-	enumerator->destroy(enumerator);
-	fprintf(out, "\n  aead:       ");
-	enumerator = lib->crypto->create_aead_enumerator(lib->crypto);
-	while (enumerator->enumerate(enumerator, &encryption))
-	{
-		fprintf(out, "%N ", encryption_algorithm_names, encryption);
-	}
-	enumerator->destroy(enumerator);
-	fprintf(out, "\n  hasher:     ");
-	enumerator = lib->crypto->create_hasher_enumerator(lib->crypto);
-	while (enumerator->enumerate(enumerator, &hash))
-	{
-		fprintf(out, "%N ", hash_algorithm_names, hash);
-	}
-	enumerator->destroy(enumerator);
-	fprintf(out, "\n  prf:        ");
-	enumerator = lib->crypto->create_prf_enumerator(lib->crypto);
-	while (enumerator->enumerate(enumerator, &prf))
-	{
-		fprintf(out, "%N ", pseudo_random_function_names, prf);
-	}
-	enumerator->destroy(enumerator);
-	fprintf(out, "\n  dh-group:   ");
-	enumerator = lib->crypto->create_dh_enumerator(lib->crypto);
-	while (enumerator->enumerate(enumerator, &group))
-	{
-		fprintf(out, "%N ", diffie_hellman_group_names, group);
-=======
 	rng_quality_t quality;
 	const char *plugin_name;
 	int len;
@@ -1220,21 +1152,13 @@ static void list_algs(FILE *out)
 	while (enumerator->enumerate(enumerator, &quality, &plugin_name))
 	{
 		print_alg(out, &len, rng_quality_names, quality, plugin_name);
->>>>>>> upstream/4.5.1
 	}
 	enumerator->destroy(enumerator);
 	fprintf(out, "\n");
 }
 
-<<<<<<< HEAD
-/**
- * Implementation of stroke_list_t.list.
- */
-static void list(private_stroke_list_t *this, stroke_msg_t *msg, FILE *out)
-=======
 METHOD(stroke_list_t, list, void,
 	private_stroke_list_t *this, stroke_msg_t *msg, FILE *out)
->>>>>>> upstream/4.5.1
 {
 	linked_list_t *cert_list = NULL;
 
@@ -1337,15 +1261,8 @@ static void pool_leases(private_stroke_list_t *this, FILE *out, char *pool,
 	}
 }
 
-<<<<<<< HEAD
-/**
- * Implementation of stroke_list_t.leases
- */
-static void leases(private_stroke_list_t *this, stroke_msg_t *msg, FILE *out)
-=======
 METHOD(stroke_list_t, leases, void,
 	private_stroke_list_t *this, stroke_msg_t *msg, FILE *out)
->>>>>>> upstream/4.5.1
 {
 	enumerator_t *enumerator;
 	u_int size, offline, online;
@@ -1382,15 +1299,8 @@ METHOD(stroke_list_t, leases, void,
 	DESTROY_IF(address);
 }
 
-<<<<<<< HEAD
-/**
- * Implementation of stroke_list_t.destroy
- */
-static void destroy(private_stroke_list_t *this)
-=======
 METHOD(stroke_list_t, destroy, void,
 	private_stroke_list_t *this)
->>>>>>> upstream/4.5.1
 {
 	free(this);
 }
@@ -1400,17 +1310,6 @@ METHOD(stroke_list_t, destroy, void,
  */
 stroke_list_t *stroke_list_create(stroke_attribute_t *attribute)
 {
-<<<<<<< HEAD
-	private_stroke_list_t *this = malloc_thing(private_stroke_list_t);
-
-	this->public.list = (void(*)(stroke_list_t*, stroke_msg_t *msg, FILE *out))list;
-	this->public.status = (void(*)(stroke_list_t*, stroke_msg_t *msg, FILE *out,bool))status;
-	this->public.leases = (void(*)(stroke_list_t*, stroke_msg_t *msg, FILE *out))leases;
-	this->public.destroy = (void(*)(stroke_list_t*))destroy;
-
-	this->uptime = time_monotonic(NULL);
-	this->attribute = attribute;
-=======
 	private_stroke_list_t *this;
 
 	INIT(this,
@@ -1424,7 +1323,6 @@ stroke_list_t *stroke_list_create(stroke_attribute_t *attribute)
 		.uptime = time_monotonic(NULL),
 		.attribute = attribute,
 	);
->>>>>>> upstream/4.5.1
 
 	return &this->public;
 }