added support for "ike" and "esp" keywords

fixed bugs in proposal code
algorithm selection for charon works now with ipsec.conf
a lot of other fixes

src/stroke/stroke.c

@@ -113,6 +113,9 @@ static int add_connection(char *name,
 	msg.add_conn.rekey.tries = 0;
 	msg.add_conn.rekey.fuzz = 0;
 	
+	msg.add_conn.algorithms.ike = NULL;
+	msg.add_conn.algorithms.esp = NULL;
+	
 	msg.add_conn.me.id = push_string(&msg, my_id);
 	msg.add_conn.me.address = push_string(&msg, my_addr);
 	msg.add_conn.me.subnet = push_string(&msg, my_net);

src/stroke/stroke.h

@@ -95,6 +95,10 @@ struct stroke_msg_t {
 		struct {
 			char *name;
 			bool ikev2;
+			struct {
+				char *ike;
+				char *esp;
+			} algorithms;
 			struct {
 				time_t ipsec_lifetime;
 				time_t ike_lifetime;