[vpnc-devel] svn commit: vpnc r308 - in /trunk: isakmp-pkt.c isakmp-pkt.h vpnc.c

[vpnc at unix-ag.uni-kl.de]

Author: Joerg Mayer
Date: Sun Jun 15 15:41:39 2008
New Revision: 308

Log:
Rename flatten_isakmp_payload to flatten_isakmp_payloads.

Modified:
    trunk/isakmp-pkt.c
    trunk/isakmp-pkt.h
    trunk/vpnc.c

Modified: trunk/isakmp-pkt.c
==============================================================================
--- trunk/isakmp-pkt.c (original)
+++ trunk/isakmp-pkt.c Sun Jun 15 15:41:39 2008
@@ -223,7 +223,7 @@
 	flow_payload(f, p->next);
 }
 
-void flatten_isakmp_payload(struct isakmp_payload *p, uint8_t ** result, size_t * size)
+void flatten_isakmp_payloads(struct isakmp_payload *p, uint8_t ** result, size_t * size)
 {
 	struct flow f;
 	init_flow(&f);

Modified: trunk/isakmp-pkt.h
==============================================================================
--- trunk/isakmp-pkt.h (original)
+++ trunk/isakmp-pkt.h Sun Jun 15 15:41:39 2008
@@ -135,7 +135,7 @@
 extern struct isakmp_attribute *new_isakmp_attribute_16(uint16_t type, uint16_t data,
 	struct isakmp_attribute *next);
 extern void free_isakmp_packet(struct isakmp_packet *p);
-extern void flatten_isakmp_payload(struct isakmp_payload *p, uint8_t ** result, size_t * size);
+extern void flatten_isakmp_payloads(struct isakmp_payload *p, uint8_t ** result, size_t * size);
 extern void flatten_isakmp_packet(struct isakmp_packet *p,
 	uint8_t ** result, size_t * size, size_t blksz);
 extern struct isakmp_packet *parse_isakmp_packet(const uint8_t * data,

Modified: trunk/vpnc.c
==============================================================================
--- trunk/vpnc.c (original)
+++ trunk/vpnc.c Sun Jun 15 15:41:39 2008
@@ -618,7 +618,7 @@
 		gcry_md_write(hm, nonce_r, nr_len);
 
 	if (pl != NULL) {
-		flatten_isakmp_payload(pl, &pl_flat, &pl_size);
+		flatten_isakmp_payloads(pl, &pl_flat, &pl_size);
 		gcry_md_write(hm, pl_flat, pl_size);
 		memset(pl_flat, 0, pl_size);
 		free(pl_flat);
@@ -1009,8 +1009,8 @@
 	a->u.lots.data = xallocc(a->u.lots.length);
 	*((uint32_t *) a->u.lots.data) = htonl(2147483);
 	a = new_isakmp_attribute_16(IKE_ATTRIB_LIFE_TYPE, IKE_LIFE_TYPE_SECONDS, a);
+	a = new_isakmp_attribute_16(IKE_ATTRIB_AUTH_METHOD, auth, a);
 	a = new_isakmp_attribute_16(IKE_ATTRIB_GROUP_DESC, dh_group, a);
-	a = new_isakmp_attribute_16(IKE_ATTRIB_AUTH_METHOD, auth, a);
 	a = new_isakmp_attribute_16(IKE_ATTRIB_HASH, hash, a);
 	a = new_isakmp_attribute_16(IKE_ATTRIB_ENC, crypt, a);
 	if (keylen != 0)
@@ -1593,9 +1593,9 @@
 			sa->next = NULL;
 			idi->next = NULL;
 			idp->next = NULL;
-			flatten_isakmp_payload(sa, &sa_f, &sa_size);
-			flatten_isakmp_payload(idi, &idi_f, &idi_size);
-			flatten_isakmp_payload(idp, &idp_f, &idp_size);
+			flatten_isakmp_payloads(sa, &sa_f, &sa_size);
+			flatten_isakmp_payloads(idi, &idi_f, &idi_size);
+			flatten_isakmp_payloads(idp, &idp_f, &idp_size);
 
 			gcry_md_open(&hm, s->ike.md_algo, GCRY_MD_FLAG_HMAC);
 			gcry_md_setkey(hm, skeyid, s->ike.md_len);