diff options
Diffstat (limited to 'security/openvpn')
| -rw-r--r-- | security/openvpn/Makefile | 2 | ||||
| -rw-r--r-- | security/openvpn/files/patch-src_openvpn_dco__freebsd.c | 14 | ||||
| -rw-r--r-- | security/openvpn/files/patch-src_openvpn_init.c | 22 |
3 files changed, 27 insertions, 11 deletions
diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile index 44f30253b5b2..690ac26738d8 100644 --- a/security/openvpn/Makefile +++ b/security/openvpn/Makefile @@ -1,6 +1,6 @@ PORTNAME= openvpn DISTVERSION= 2.6.14 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES= security net net-vpn MASTER_SITES= https://swupdate.openvpn.org/community/releases/ \ https://build.openvpn.net/downloads/releases/ \ diff --git a/security/openvpn/files/patch-src_openvpn_dco__freebsd.c b/security/openvpn/files/patch-src_openvpn_dco__freebsd.c index 22c24baa9ec3..686fc6584be7 100644 --- a/security/openvpn/files/patch-src_openvpn_dco__freebsd.c +++ b/security/openvpn/files/patch-src_openvpn_dco__freebsd.c @@ -1,6 +1,6 @@ --- src/openvpn/dco_freebsd.c.orig 2025-04-02 06:53:10 UTC +++ src/openvpn/dco_freebsd.c -@@ -72,6 +72,67 @@ sockaddr_to_nvlist(const struct sockaddr *sa) +@@ -72,6 +72,61 @@ sockaddr_to_nvlist(const struct sockaddr *sa) return (nvl); } @@ -32,10 +32,7 @@ + + in->sin_len = sizeof(*in); + data = nvlist_get_binary(nvl, "address", &len); -+ if (len != sizeof(in->sin_addr)) -+ { -+ return (false); -+ } ++ ASSERT(len == sizeof(in->sin_addr)); + memcpy(&in->sin_addr, data, sizeof(in->sin_addr)); + in->sin_port = nvlist_get_number(nvl, "port"); + break; @@ -49,10 +46,7 @@ + + in6->sin6_len = sizeof(*in6); + data = nvlist_get_binary(nvl, "address", &len); -+ if (len != sizeof(in6->sin6_addr)) -+ { -+ return (false); -+ } ++ ASSERT(len == sizeof(in6->sin6_addr)); + memcpy(&in6->sin6_addr, data, sizeof(in6->sin6_addr)); + in6->sin6_port = nvlist_get_number(nvl, "port"); + break; @@ -68,7 +62,7 @@ int dco_new_peer(dco_context_t *dco, unsigned int peerid, int sd, struct sockaddr *localaddr, struct sockaddr *remoteaddr, -@@ -570,6 +631,25 @@ dco_do_read(dco_context_t *dco) +@@ -570,6 +625,25 @@ dco_do_read(dco_context_t *dco) case OVPN_NOTIF_ROTATE_KEY: dco->dco_message_type = OVPN_CMD_SWAP_KEYS; break; diff --git a/security/openvpn/files/patch-src_openvpn_init.c b/security/openvpn/files/patch-src_openvpn_init.c new file mode 100644 index 000000000000..0d09e6050236 --- /dev/null +++ b/security/openvpn/files/patch-src_openvpn_init.c @@ -0,0 +1,22 @@ +--- src/openvpn/init.c.orig 2025-04-02 06:53:10 UTC ++++ src/openvpn/init.c +@@ -330,7 +330,7 @@ management_callback_remote_entry_count(void *arg) + static unsigned int + management_callback_remote_entry_count(void *arg) + { +- assert(arg); ++ ASSERT(arg); + struct context *c = (struct context *) arg; + struct connection_list *l = c->options.connection_list; + +@@ -340,8 +340,8 @@ management_callback_remote_entry_get(void *arg, unsign + static bool + management_callback_remote_entry_get(void *arg, unsigned int index, char **remote) + { +- assert(arg); +- assert(remote); ++ ASSERT(arg); ++ ASSERT(remote); + + struct context *c = (struct context *) arg; + struct connection_list *l = c->options.connection_list; |