View | Details | Raw Unified | Return to bug 203308 | Differences between
and this patch

Collapse All | Expand All

(-)/home/pi/myp/security/ipsec-tools/files/patch-src-racoon-isakmp_cfg.c (-3 / +3 lines)
Lines 1-4 Link Here
1 
--- src/racoon/isakmp_cfg.c
 1 
--- src/racoon/isakmp_cfg.c.orig	2013-04-12 10:04:21 UTC
2 
+++ src/racoon/isakmp_cfg.c
 2 
+++ src/racoon/isakmp_cfg.c
3 
@@ -38,7 +38,9 @@
 3 
@@ -38,7 +38,9 @@
4 
 #include <sys/socket.h>
 4 
 #include <sys/socket.h>
Lines 10-16 Link Here
10 
 #if defined(__APPLE__) && defined(__MACH__)
 10 
 #if defined(__APPLE__) && defined(__MACH__)
11 
 #include <util.h>
 11 
 #include <util.h>
12 
 #endif
 12 
 #endif
13 
@@ -1663,6 +1665,7 @@
 13 
@@ -1663,6 +1665,7 @@ isakmp_cfg_accounting_system(port, raddr
14 
 	char *usr;
 14 
 	char *usr;
15 
 	int inout;
 15 
 	int inout;
16 
 {
 16 
 {
Lines 18-24 Link Here
18 
 	int error = 0;
 18 
 	int error = 0;
19 
 	struct utmpx ut;
 19 
 	struct utmpx ut;
20 
 	char addr[NI_MAXHOST];
 20 
 	char addr[NI_MAXHOST];
21 
@@ -1706,6 +1709,7 @@
 21 
@@ -1706,6 +1709,7 @@ isakmp_cfg_accounting_system(port, raddr
22 
 		plog(LLV_ERROR, LOCATION, NULL, "Unepected inout\n");
 22 
 		plog(LLV_ERROR, LOCATION, NULL, "Unepected inout\n");
23 
 		break;
 23 
 		break;
24 
 	}
 24 
 	}
(-)/home/pi/myp/security/ipsec-tools/files/patch-src_racoon_gssapi.c (-1 / +1 lines)
Lines 1-4 Link Here
1 
--- src/racoon/gssapi.c.orig	2015-05-19 16:38:06 UTC
 1 
--- src/racoon/gssapi.c.orig	2006-09-09 16:22:09 UTC
2 
+++ src/racoon/gssapi.c
 2 
+++ src/racoon/gssapi.c
3 
@@ -192,6 +192,11 @@ gssapi_init(struct ph1handle *iph1)
 3 
@@ -192,6 +192,11 @@ gssapi_init(struct ph1handle *iph1)
4 
 	gss_name_t princ, canon_princ;
 4 
 	gss_name_t princ, canon_princ;
(-)/home/pi/myp/security/ipsec-tools/files/patch-src_racoon_oakley.c (+31 lines)
Line 0 Link Here
1 
--- src/racoon/oakley.c.orig	2012-08-29 11:35:09 UTC
2 
+++ src/racoon/oakley.c
3 
@@ -2391,6 +2391,7 @@ oakley_skeyid(iph1)
4 
 	char *p;
5 
 	int len;
6 
 	int error = -1;
7 
+	struct ipsecdoi_id_b *id_b;
8
9 
 	/* SKEYID */
10 
 	switch (iph1->approval->authmethod) {
11 
@@ -2400,7 +2401,19 @@ oakley_skeyid(iph1)
12 
 	case OAKLEY_ATTR_AUTH_METHOD_XAUTH_PSKEY_R:
13 
 #endif
14 
 		if (iph1->etype != ISAKMP_ETYPE_IDENT) {
15 
-			iph1->authstr = getpskbyname(iph1->id_p);
16 
+		  id_b = (struct ipsecdoi_id_b *)iph1->id_p->v;
17 
+
18 
+		  if (id_b->type != IPSECDOI_ID_IPV4_ADDR
19 
+                   && id_b->type != IPSECDOI_ID_IPV6_ADDR) {
20 
+	                	iph1->authstr = getpskbyname(iph1->id_p);
21 
+			} else {
22 
+               			struct sockaddr addr;
23 
+                		u_int8_t prefix;
24 
+                		u_int16_t ul_proto;
25 
+                        	if (!ipsecdoi_id2sockaddr(iph1->id_p, &addr, &prefix, &ul_proto)) {
26 
+					iph1->authstr = getpskbyaddr(&addr);
27 
+				}
28 
+			}
29 
 			if (iph1->authstr == NULL) {
30 
 				if (iph1->rmconf->verify_identifier) {
31 
 					plog(LLV_ERROR, LOCATION, iph1->remote,

Return to bug 203308