mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-10 16:40:03 +00:00
ipsec-tools: Fix build with gcc7
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
This commit is contained in:
+30
@@ -0,0 +1,30 @@
|
|||||||
|
From a5c59f6a1479947d33dba5191724cc5fc88a614b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Sat, 22 Apr 2017 10:39:57 -0700
|
||||||
|
Subject: [PATCH 2/2] cfparse: clear memory equal to size of array
|
||||||
|
|
||||||
|
Fixes compiler error
|
||||||
|
cfparse.y: In function 'set_isakmp_proposal':
|
||||||
|
cfparse.y:2567:3: error: 'memset' used with length equal to number of elements without multiplication by element size [-Werror=memset-elt-size]
|
||||||
|
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
src/racoon/cfparse.y | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/racoon/cfparse.y b/src/racoon/cfparse.y
|
||||||
|
index 0d9bd67..5d9c67b 100644
|
||||||
|
--- a/src/racoon/cfparse.y
|
||||||
|
+++ b/src/racoon/cfparse.y
|
||||||
|
@@ -2564,7 +2564,7 @@ set_isakmp_proposal(rmconf)
|
||||||
|
plog(LLV_DEBUG2, LOCATION, NULL,
|
||||||
|
"encklen=%d\n", s->encklen);
|
||||||
|
|
||||||
|
- memset(types, 0, ARRAYLEN(types));
|
||||||
|
+ memset(types, 0, sizeof(types));
|
||||||
|
types[algclass_isakmp_enc] = s->algclass[algclass_isakmp_enc];
|
||||||
|
types[algclass_isakmp_hash] = s->algclass[algclass_isakmp_hash];
|
||||||
|
types[algclass_isakmp_dh] = s->algclass[algclass_isakmp_dh];
|
||||||
|
--
|
||||||
|
2.12.2
|
||||||
|
|
||||||
@@ -23,6 +23,7 @@ SRC_URI = "http://ftp.netbsd.org/pub/NetBSD/misc/ipsec-tools/0.8/ipsec-tools-${P
|
|||||||
file://fix-CVE-2015-4047.patch \
|
file://fix-CVE-2015-4047.patch \
|
||||||
file://0001-Fix-build-with-clang.patch \
|
file://0001-Fix-build-with-clang.patch \
|
||||||
file://0001-Fix-header-issues-found-with-musl-libc.patch \
|
file://0001-Fix-header-issues-found-with-musl-libc.patch \
|
||||||
|
file://0002-cfparse-clear-memory-equal-to-size-of-array.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[md5sum] = "d53ec14a0a3ece64e09e5e34b3350b41"
|
SRC_URI[md5sum] = "d53ec14a0a3ece64e09e5e34b3350b41"
|
||||||
SRC_URI[sha256sum] = "8eb6b38716e2f3a8a72f1f549c9444c2bc28d52c9536792690564c74fe722f2d"
|
SRC_URI[sha256sum] = "8eb6b38716e2f3a8a72f1f549c9444c2bc28d52c9536792690564c74fe722f2d"
|
||||||
|
|||||||
Reference in New Issue
Block a user