ee061f381a
- Resolves: rhbz#1392191 libreswan: crash when OSX client connects - Improved uniqueid and session replacing support - Test Buffer warning fix on size_t - Re-introduce --configdir for backwards compatibility
22 lines
869 B
Diff
22 lines
869 B
Diff
diff -Naur libreswan-3.19-orig/programs/pluto/test_buffer.c libreswan-3.19/programs/pluto/test_buffer.c
|
|
--- libreswan-3.19-orig/programs/pluto/test_buffer.c 2017-01-15 14:34:34.000000000 -0500
|
|
+++ libreswan-3.19/programs/pluto/test_buffer.c 2017-01-15 15:26:25.800866709 -0500
|
|
@@ -67,7 +67,7 @@
|
|
if (i != 2) {
|
|
loglog(RC_INTERNALERR,
|
|
"unexpected space or NUL character at offset %zu in hex buffer \"%s\" at \"%s\"\n",
|
|
- pos - string, string, pos);
|
|
+ (size_t)(pos - string), string, pos);
|
|
exit_pluto(PLUTO_EXIT_NSS_FAIL);
|
|
}
|
|
char *end;
|
|
@@ -75,7 +75,7 @@
|
|
if (end - buf != 2) {
|
|
loglog(RC_INTERNALERR,
|
|
"invalid character at offset %zu in hex buffer \"%s\" at \"%s\"\n",
|
|
- pos-string, string, pos);
|
|
+ (size_t)(pos-string), string, pos);
|
|
exit_pluto(PLUTO_EXIT_NSS_FAIL);
|
|
}
|
|
chunk.len++;
|