From 73887707818c4c9dbc31416c380d89322162066e Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Mon, 19 Feb 2018 19:05:10 -0500 Subject: [PATCH] make gcc7 truly happy --- libreswan-3.23-gcc8.patch | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/libreswan-3.23-gcc8.patch b/libreswan-3.23-gcc8.patch index 10adc15..62a8fde 100644 --- a/libreswan-3.23-gcc8.patch +++ b/libreswan-3.23-gcc8.patch @@ -1,6 +1,6 @@ diff -Naur libreswan-3.23-orig/programs/pluto/kernel_netlink.c libreswan-3.23/programs/pluto/kernel_netlink.c --- libreswan-3.23-orig/programs/pluto/kernel_netlink.c 2018-01-25 15:19:46.000000000 -0500 -+++ libreswan-3.23/programs/pluto/kernel_netlink.c 2018-02-19 18:07:08.654780313 -0500 ++++ libreswan-3.23/programs/pluto/kernel_netlink.c 2018-02-19 18:56:24.433527475 -0500 @@ -51,8 +51,9 @@ #include #include @@ -14,7 +14,7 @@ diff -Naur libreswan-3.23-orig/programs/pluto/kernel_netlink.c libreswan-3.23/pr #include "libreswan/pfkey.h" diff -Naur libreswan-3.23-orig/programs/pluto/linux_audit.c libreswan-3.23/programs/pluto/linux_audit.c --- libreswan-3.23-orig/programs/pluto/linux_audit.c 2018-01-25 15:19:46.000000000 -0500 -+++ libreswan-3.23/programs/pluto/linux_audit.c 2018-02-19 18:07:08.654780313 -0500 ++++ libreswan-3.23/programs/pluto/linux_audit.c 2018-02-19 18:58:51.356837932 -0500 @@ -74,6 +74,15 @@ #include "pluto_stats.h" @@ -31,6 +31,24 @@ diff -Naur libreswan-3.23-orig/programs/pluto/linux_audit.c libreswan-3.23/progr static bool log_to_audit = FALSE; /* audit log messages for kernel */ void linux_audit_init(void) +@@ -159,13 +168,13 @@ + char raddr[ADDRTOT_BUF]; + char laddr[ADDRTOT_BUF]; + char audit_str[AUDIT_LOG_SIZE]; +- char cipher_str[AUDIT_LOG_SIZE]; +- char spi_str[AUDIT_LOG_SIZE]; ++ char cipher_str[20]; ++ char spi_str[20]; + struct connection *const c = st->st_connection; + bool initiator = FALSE; + char head[IDTOA_BUF]; +- char integname[IDTOA_BUF]; +- char prfname[IDTOA_BUF]; ++ char integname[20]; ++ char prfname[20]; + struct esb_buf esb, esb2; + /* we need to free() this */ + char *conn_encode = audit_encode_nv_string("conn-name",c->name,0); @@ -300,3 +309,6 @@ AUDIT_CRYPTO_IPSEC_SA : AUDIT_CRYPTO_IKE_SA, audit_str, raddr, AUDIT_RESULT_OK); @@ -40,7 +58,7 @@ diff -Naur libreswan-3.23-orig/programs/pluto/linux_audit.c libreswan-3.23/progr +#endif diff -Naur libreswan-3.23-orig/programs/pluto/log.h libreswan-3.23/programs/pluto/log.h --- libreswan-3.23-orig/programs/pluto/log.h 2018-01-25 15:19:46.000000000 -0500 -+++ libreswan-3.23/programs/pluto/log.h 2018-02-19 18:07:08.655780307 -0500 ++++ libreswan-3.23/programs/pluto/log.h 2018-02-19 18:56:24.433527475 -0500 @@ -154,7 +154,7 @@ #ifdef USE_LINUX_AUDIT @@ -52,7 +70,7 @@ diff -Naur libreswan-3.23-orig/programs/pluto/log.h libreswan-3.23/programs/plut #define AUDIT_RESULT_OK 1 diff -Naur libreswan-3.23-orig/programs/pluto/pluto_constants.c libreswan-3.23/programs/pluto/pluto_constants.c --- libreswan-3.23-orig/programs/pluto/pluto_constants.c 2018-01-25 15:19:46.000000000 -0500 -+++ libreswan-3.23/programs/pluto/pluto_constants.c 2018-02-19 18:08:22.359413451 -0500 ++++ libreswan-3.23/programs/pluto/pluto_constants.c 2018-02-19 18:56:24.434527471 -0500 @@ -478,7 +478,7 @@ policy & ~(POLICY_SHUNT_MASK | POLICY_FAIL_MASK),