Compare commits

...

2 Commits
v3.17 ... v3.18

Author SHA1 Message Date
Jan Engelhardt
87189b0051 Xtables-addons 3.18 2021-03-11 17:13:17 +01:00
Jan Engelhardt
d3fb275c03 xt_pknock: fix build failure under platforms like ARM 32-bit
./arch/arm/include/asm/div64.h:24:45: note: expected "uint64_t *"
{aka "long long unsigned int *"} but argument is of type
"long unsigned int *"
   24 | static inline uint32_t __div64_32(uint64_t *n, uint32_t base)
2021-03-11 17:11:47 +01:00
4 changed files with 9 additions and 4 deletions

View File

@@ -1,4 +1,4 @@
AC_INIT([xtables-addons], [3.17]) AC_INIT([xtables-addons], [3.18])
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])

View File

@@ -1,3 +1,8 @@
v3.18 (2021-03-11)
==================
- xt_pknock: fix a build failure on ARM 32-bit
v3.17 (2021-02-28) v3.17 (2021-02-28)
================== ==================
- xt_pknock: cure a NULL deref - xt_pknock: cure a NULL deref

View File

@@ -338,7 +338,7 @@ is_interknock_time_exceeded(const struct peer *peer, unsigned int max_time)
static inline bool static inline bool
has_logged_during_this_minute(const struct peer *peer) has_logged_during_this_minute(const struct peer *peer)
{ {
unsigned long x, y; uint64_t x, y;
if (peer == NULL) if (peer == NULL)
return 0; return 0;
x = ktime_get_seconds(); x = ktime_get_seconds();
@@ -717,7 +717,7 @@ has_secret(const unsigned char *secret, unsigned int secret_len, uint32_t ipsrc,
unsigned int hexa_size; unsigned int hexa_size;
int ret; int ret;
bool fret = false; bool fret = false;
unsigned long x; uint64_t x;
unsigned int epoch_min; unsigned int epoch_min;
if (payload_len == 0) if (payload_len == 0)

View File

@@ -1,4 +1,4 @@
.TH xtables-addons 8 "" "" "v3.17 (2021-02-28)" .TH xtables-addons 8 "" "" "v3.18 (2021-03-11)"
.SH Name .SH Name
Xtables-addons \(em additional extensions for iptables, ip6tables, etc. Xtables-addons \(em additional extensions for iptables, ip6tables, etc.
.SH Targets .SH Targets