357501e799
This patch updates ipsec-tools to version 0.8.1 and refreshes its patches. It was released on Sourceforge on 2013-01-08. Compile and run tested, no problems found. Patch-by: Anton van Bohemen <avbohemen@ziggo.nl> Signed-off-by: Gabor Juhos <juhosg@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/packages@35640 3c298f89-4303-0410-b956-a3cf2f4a3e73
25 lines
732 B
Diff
25 lines
732 B
Diff
--- a/src/racoon/oakley.c
|
|
+++ b/src/racoon/oakley.c
|
|
@@ -2424,8 +2424,21 @@ oakley_skeyid(iph1)
|
|
plog(LLV_ERROR, LOCATION, iph1->remote,
|
|
"couldn't find the pskey for %s.\n",
|
|
saddrwop2str(iph1->remote));
|
|
+ }
|
|
+ }
|
|
+ if (iph1->authstr == NULL) {
|
|
+ /*
|
|
+ * If we could not locate a psk above try and locate
|
|
+ * the default psk, ie, "*".
|
|
+ */
|
|
+ iph1->authstr = privsep_getpsk("*", 1);
|
|
+ if (iph1->authstr == NULL) {
|
|
+ plog(LLV_ERROR, LOCATION, iph1->remote,
|
|
+ "couldn't find the the default pskey either.\n");
|
|
goto end;
|
|
}
|
|
+ plog(LLV_NOTIFY, LOCATION, iph1->remote,
|
|
+ "Using default PSK.\n");
|
|
}
|
|
plog(LLV_DEBUG, LOCATION, NULL, "the psk found.\n");
|
|
/* should be secret PSK */
|