bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] strongswan: upgrade to 5.1.1

Browse Source 
Signed-off-by: Luka Perkov <luka@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@39377 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
luka
2014-01-23 16:12:01 +00:00
parent d40f0f4555
commit 1e8e3cd070
3 changed files with 20 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
net/strongswan/patches/001-upstream-runtime-fix.patch
View File

@ -1,39 +0,0 @@
From: Martin Willi <martin@revosec.ch>
Date: Fri, 3 May 2013 12:17:37 +0000 (+0200)
Subject: In memwipe_check(), don't put magic on stack when calling do_magic()
X-Git-Url: http://git.strongswan.org/?p=strongswan.git;a=commitdiff_plain;h=9312fbc7
In memwipe_check(), don't put magic on stack when calling do_magic()
Otherwise the magic might be on the stack while checking it.
---
--- a/src/libstrongswan/library.c
+++ b/src/libstrongswan/library.c
@@ -154,7 +154,7 @@ static bool equals(char *a, char *b)
* Write magic to memory, and try to clear it with memwipe()
*/
__attribute__((noinline))
-static void do_magic(int magic, int **stack)
+static void do_magic(int *magic, int **stack)
{
int buf[32], i;
@@ -162,7 +162,7 @@ static void do_magic(int magic, int **st
*stack = &i;
for (i = 0; i < countof(buf); i++)
{
- buf[i] = magic;
+ buf[i] = *magic;
}
/* passing buf to dbg should make sure the compiler can't optimize out buf.
* we use directly dbg(3), as DBG3() might be stripped with DEBUG_LEVEL. */
@@ -177,7 +177,7 @@ static bool check_memwipe()
{
int magic = 0xCAFEBABE, *ptr, *deeper, i, stackdir = 1;
- do_magic(magic, &deeper);
+ do_magic(&magic, &deeper);
ptr = &magic;
if (deeper < ptr)

12
net/strongswan/patches/201-no-modprobe.patch → net/strongswan/patches/201-kmodloader.patch
View File

@ -5,7 +5,7 @@
if (stat(PROC_MODULES, &stb) == 0)
{
- ignore_result(system("modprobe -qv af_key"));
+ ignore_result(system("insmod -qv af_key"));
+ ignore_result(system("modprobe af_key 2>&1 >/dev/null"));
}
/* now test again */
@ -18,11 +18,11 @@
- ignore_result(system("modprobe -qv ipcomp"));
- ignore_result(system("modprobe -qv xfrm4_tunnel"));
- ignore_result(system("modprobe -qv xfrm_user"));
+ ignore_result(system("insmod -qv ah4"));
+ ignore_result(system("insmod -qv esp4"));
+ ignore_result(system("insmod -qv ipcomp"));
+ ignore_result(system("insmod -qv xfrm4_tunnel"));
+ ignore_result(system("insmod -qv xfrm_user"));
+ ignore_result(system("modprobe ah4 2>&1 >/dev/null"));
+ ignore_result(system("modprobe esp4 2>&1 >/dev/null"));
+ ignore_result(system("modprobe ipcomp 2>&1 >/dev/null"));
+ ignore_result(system("modprobe xfrm4_tunnel 2>&1 >/dev/null"));
+ ignore_result(system("modprobe xfrm_user 2>&1 >/dev/null"));
}
DBG2(DBG_APP, "found netkey IPsec stack");