Upgrade to wiresep 0.10.1

All patches merged upstream.
This commit is contained in:
kn 2020-03-31 19:00:59 +00:00
parent 5b628c4d8c
commit 6142fd8157
4 changed files with 5 additions and 53 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.3 2020/03/18 22:22:25 tb Exp $
# $OpenBSD: Makefile,v 1.4 2020/03/31 19:00:59 kn Exp $
COMMENT = privilege separated implementation of WireGuard
COMMENT = privilege separated implementation of WireGuard
GH_ACCOUNT = timkuijsten
GH_PROJECT = wiresep
GH_TAGNAME = v0.9.0
GH_TAGNAME = v0.10.1
CATEGORIES = net

View File

@ -1,2 +1,2 @@
SHA256 (wiresep-0.9.0.tar.gz) = SNdzSCMFfvRsssMRW3DbkbVj+H3pq9NpJQcNiR0oTEE=
SIZE (wiresep-0.9.0.tar.gz) = 97932
SHA256 (wiresep-0.10.1.tar.gz) = Dps3BN8zgtwKGbiG8mAAGMZ5jqA5oooVEHQhpdm8a48=
SIZE (wiresep-0.10.1.tar.gz) = 99830

View File

@ -1,30 +0,0 @@
$OpenBSD: patch-ifn_c,v 1.2 2020/03/18 22:22:25 tb Exp $
warning: left shift count >= width of type [-Wshift-count-overflow]
ifaddr->v4mask = htonl(((1UL << 32) - 1) <<
^~
warning: left shift count >= width of type [-Wshift-count-overflow]
allowedip->v4mask = ((1UL << 32) - 1) <<
^~
Index: ifn.c
--- ifn.c.orig
+++ ifn.c
@@ -2937,7 +2937,7 @@ recvconfig(int masterport)
} else if (ifaddr->addr.family == AF_INET) {
assert(ifaddr->prefixlen <= 32);
- ifaddr->v4mask = htonl(((1UL << 32) - 1) <<
+ ifaddr->v4mask = htonl(((1ULL << 32) - 1) <<
(32 - ifaddr->prefixlen));
sin = (struct sockaddr_in *)&ifaddr->addr;
@@ -3057,7 +3057,7 @@ recvconfig(int masterport)
} else if (allowedip->addr.family == AF_INET) {
assert(allowedip->prefixlen <= 32);
- allowedip->v4mask = ((1UL << 32) - 1) <<
+ allowedip->v4mask = ((1ULL << 32) - 1) <<
(32 - allowedip->prefixlen);
sin = (struct sockaddr_in *)&allowedip->addr;

View File

@ -1,18 +0,0 @@
$OpenBSD: patch-util_c,v 1.2 2020/03/18 22:22:25 tb Exp $
warning: comparison is always false due to limited range of data type [-Wtype-limits]
if (asciihexmap[(unsigned char)src[i]] < 0)
^
Index: util.c
--- util.c.orig
+++ util.c
@@ -43,7 +43,7 @@
extern int background, verbose;
-const char asciihexmap[] = {
+const signed char asciihexmap[] = {
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, /* ! */