|
 |
f301ee |
diff -Naur libreswan-3.32-orig/lib/libipsecconf/interfaces.c libreswan-3.32/lib/libipsecconf/interfaces.c
|
|
|
f301ee |
--- libreswan-3.32-orig/lib/libipsecconf/interfaces.c 2020-05-11 10:13:41.000000000 -0400
|
|
|
f301ee |
+++ libreswan-3.32/lib/libipsecconf/interfaces.c 2020-06-04 18:51:39.508280352 -0400
|
|
|
f301ee |
@@ -71,7 +71,11 @@
|
|
|
f301ee |
if (sa->sa.sa_family == af) {
|
|
|
f301ee |
/* XXX: sizeof right? */
|
|
|
f301ee |
ip_endpoint nhe;
|
|
|
f301ee |
- happy(sockaddr_to_endpoint(sa, sizeof(*sa), &nhe));
|
|
|
f301ee |
+ err_t e = sockaddr_to_endpoint(sa, sizeof(*sa), &nhe;;
|
|
|
f301ee |
+ if (e != NULL) {
|
|
|
f301ee |
+ pexpect(e != NULL);
|
|
|
f301ee |
+ return false;
|
|
|
f301ee |
+ }
|
|
|
f301ee |
pexpect(endpoint_hport(&nhe) == 0);
|
|
|
f301ee |
*nh = endpoint_address(&nhe;;
|
|
|
f301ee |
}
|
|
|
f301ee |
@@ -84,7 +88,11 @@
|
|
|
f301ee |
if (sa->sa.sa_family == af) {
|
|
|
f301ee |
/* XXX: sizeof right? */
|
|
|
f301ee |
ip_endpoint dste;
|
|
|
f301ee |
- happy(sockaddr_to_endpoint(sa, sizeof(*sa), &dste));
|
|
|
f301ee |
+ err_t e = sockaddr_to_endpoint(sa, sizeof(*sa), &dste;;
|
|
|
f301ee |
+ if (e != NULL) {
|
|
|
f301ee |
+ pexpect(e != NULL);
|
|
|
f301ee |
+ return false;
|
|
|
f301ee |
+ }
|
|
|
f301ee |
pexpect(endpoint_hport(&dste) == 0);
|
|
|
f301ee |
*dst = endpoint_address(&dste;;
|
|
|
f301ee |
}
|
|
|
f301ee |
diff -Naur libreswan-3.32-orig/lib/libswan/ip_endpoint.c libreswan-3.32/lib/libswan/ip_endpoint.c
|
|
|
f301ee |
--- libreswan-3.32-orig/lib/libswan/ip_endpoint.c 2020-05-11 10:13:41.000000000 -0400
|
|
|
f301ee |
+++ libreswan-3.32/lib/libswan/ip_endpoint.c 2020-06-04 18:51:39.508280352 -0400
|
|
|
f301ee |
@@ -54,20 +54,12 @@
|
|
|
f301ee |
switch (sa->sa.sa_family) {
|
|
|
f301ee |
case AF_INET:
|
|
|
f301ee |
{
|
|
|
f301ee |
- /* XXX: to strict? */
|
|
|
f301ee |
- if (sa_len != sizeof(sa->sin)) {
|
|
|
f301ee |
- return "wrong length";
|
|
|
f301ee |
- }
|
|
|
f301ee |
address = address_from_in_addr(&sa->sin.sin_addr);
|
|
|
f301ee |
port = ntohs(sa->sin.sin_port);
|
|
|
f301ee |
break;
|
|
|
f301ee |
}
|
|
|
f301ee |
case AF_INET6:
|
|
|
f301ee |
{
|
|
|
f301ee |
- /* XXX: to strict? */
|
|
|
f301ee |
- if (sa_len != sizeof(sa->sin6)) {
|
|
|
f301ee |
- return "wrong length";
|
|
|
f301ee |
- }
|
|
|
f301ee |
address = address_from_in6_addr(&sa->sin6.sin6_addr);
|
|
|
f301ee |
port = ntohs(sa->sin6.sin6_port);
|
|
|
f301ee |
break;
|