From: Leonard Crestez <cdleonard@gmail.com>
To: David Ahern <dsahern@kernel.org>, Shuah Khan <shuah@kernel.org>,
Dmitry Safonov <0x7f454c46@gmail.com>,
Eric Dumazet <edumazet@google.com>
Cc: "David S. Miller" <davem@davemloft.net>,
Herbert Xu <herbert@gondor.apana.org.au>,
Kuniyuki Iwashima <kuniyu@amazon.co.jp>,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>,
Jakub Kicinski <kuba@kernel.org>,
Yuchung Cheng <ycheng@google.com>,
Francesco Ruggeri <fruggeri@arista.com>,
Mat Martineau <mathew.j.martineau@linux.intel.com>,
Christoph Paasch <cpaasch@apple.com>,
Ivan Delalande <colona@arista.com>,
Priyaranjan Jha <priyarjha@google.com>,
netdev@vger.kernel.org, linux-crypto@vger.kernel.org,
linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 15/25] selftests: tcp_authopt: Implement SNE in python
Date: Mon, 1 Nov 2021 18:34:50 +0200 [thread overview]
Message-ID: <ce875c2c65a2bdc181bd2a4b38d5dee45d49ab66.1635784253.git.cdleonard@gmail.com> (raw)
In-Reply-To: <cover.1635784253.git.cdleonard@gmail.com>
Add implementation and tests for Sequence Number Extension.
One implementation is based on an IETF draft:
https://datatracker.ietf.org/doc/draft-touch-sne/
The linux implementation is simpler and doesn't require additional
flags, it just relies on standard before/after macros.
Signed-off-by: Leonard Crestez <cdleonard@gmail.com>
---
.../tcp_authopt/tcp_authopt_test/sne_alg.py | 111 ++++++++++++++++++
.../tcp_authopt_test/test_sne_alg.py | 96 +++++++++++++++
2 files changed, 207 insertions(+)
create mode 100644 tools/testing/selftests/tcp_authopt/tcp_authopt_test/sne_alg.py
create mode 100644 tools/testing/selftests/tcp_authopt/tcp_authopt_test/test_sne_alg.py
diff --git a/tools/testing/selftests/tcp_authopt/tcp_authopt_test/sne_alg.py b/tools/testing/selftests/tcp_authopt/tcp_authopt_test/sne_alg.py
new file mode 100644
index 000000000000..252356dc87a4
--- /dev/null
+++ b/tools/testing/selftests/tcp_authopt/tcp_authopt_test/sne_alg.py
@@ -0,0 +1,111 @@
+# SPDX-License-Identifier: GPL-2.0
+"""Python implementation of SNE algorithms"""
+
+
+def distance(x, y):
+ if x < y:
+ return y - x
+ else:
+ return x - y
+
+
+class SequenceNumberExtender:
+ """Based on https://datatracker.ietf.org/doc/draft-touch-sne/"""
+
+ sne: int = 0
+ sne_flag: int = 1
+ prev_seq: int = 0
+
+ def calc(self, seq):
+ """Update internal state and return SNE for certain SEQ"""
+ # use current SNE to start
+ result = self.sne
+
+ # both in same SNE range?
+ if distance(seq, self.prev_seq) < 0x80000000:
+ # jumps fwd over N/2?
+ if seq >= 0x80000000 and self.prev_seq < 0x80000000:
+ self.sne_flag = 0
+ # move prev forward if needed
+ self.prev_seq = max(seq, self.prev_seq)
+ # both in diff SNE ranges?
+ else:
+ # jumps forward over zero?
+ if seq < 0x80000000:
+ # update prev
+ self.prev_seq = seq
+ # first jump over zero? (wrap)
+ if self.sne_flag == 0:
+ # set flag so we increment once
+ self.sne_flag = 1
+ # increment window
+ self.sne = self.sne + 1
+ # use updated SNE value
+ result = self.sne
+ # jump backward over zero?
+ else:
+ # use pre-rollover SNE value
+ result = self.sne - 1
+
+ return result
+
+
+class SequenceNumberExtenderRFC:
+ """Based on sample code in original RFC5925 document"""
+
+ sne: int = 0
+ sne_flag: int = 1
+ prev_seq: int = 0
+
+ def calc(self, seq):
+ """Update internal state and return SNE for certain SEQ"""
+ # set the flag when the SEG.SEQ first rolls over
+ if self.sne_flag == 0 and self.prev_seq > 0x7FFFFFFF and seq < 0x7FFFFFFF:
+ self.sne = self.sne + 1
+ self.sne_flag = 1
+ # decide which SNE to use after incremented
+ if self.sne_flag and seq > 0x7FFFFFFF:
+ # use the pre-increment value
+ sne = self.sne - 1
+ else:
+ # use the current value
+ sne = self.sne
+ # reset the flag in the *middle* of the window
+ if self.prev_seq < 0x7FFFFFFF and seq > 0x7FFFFFFF:
+ self.sne_flag = 0
+ # save the current SEQ for the next time through the code
+ self.prev_seq = seq
+
+ return sne
+
+
+def tcp_seq_before(a, b) -> bool:
+ return ((a - b) & 0xFFFFFFFF) > 0x80000000
+
+
+def tcp_seq_after(a, b) -> bool:
+ return tcp_seq_before(a, b)
+
+
+class SequenceNumberExtenderLinux:
+ """Based on linux implementation and with no extra flags"""
+
+ sne: int = 0
+ prev_seq: int = 0
+
+ def reset(self, seq, sne=0):
+ self.prev_seq = seq
+ self.sne = sne
+
+ def calc(self, seq, update=True):
+ sne = self.sne
+ if tcp_seq_before(seq, self.prev_seq):
+ if seq > self.prev_seq:
+ sne -= 1
+ else:
+ if seq < self.prev_seq:
+ sne += 1
+ if update and tcp_seq_before(self.prev_seq, seq):
+ self.prev_seq = seq
+ self.sne = sne
+ return sne
diff --git a/tools/testing/selftests/tcp_authopt/tcp_authopt_test/test_sne_alg.py b/tools/testing/selftests/tcp_authopt/tcp_authopt_test/test_sne_alg.py
new file mode 100644
index 000000000000..9b74873cff4a
--- /dev/null
+++ b/tools/testing/selftests/tcp_authopt/tcp_authopt_test/test_sne_alg.py
@@ -0,0 +1,96 @@
+# SPDX-License-Identifier: GPL-2.0
+"""Test SNE algorithm implementations"""
+
+import logging
+
+import pytest
+
+from .sne_alg import (
+ SequenceNumberExtender,
+ SequenceNumberExtenderLinux,
+ SequenceNumberExtenderRFC,
+)
+
+logger = logging.getLogger(__name__)
+
+
+# Data from https://datatracker.ietf.org/doc/draft-touch-sne/
+_SNE_TEST_DATA = [
+ (0x00000000, 0x00000000),
+ (0x00000000, 0x30000000),
+ (0x00000000, 0x90000000),
+ (0x00000000, 0x70000000),
+ (0x00000000, 0xA0000000),
+ (0x00000001, 0x00000001),
+ (0x00000000, 0xE0000000),
+ (0x00000001, 0x00000000),
+ (0x00000001, 0x7FFFFFFF),
+ (0x00000001, 0x00000000),
+ (0x00000001, 0x50000000),
+ (0x00000001, 0x80000000),
+ (0x00000001, 0x00000001),
+ (0x00000001, 0x40000000),
+ (0x00000001, 0x90000000),
+ (0x00000001, 0xB0000000),
+ (0x00000002, 0x0FFFFFFF),
+ (0x00000002, 0x20000000),
+ (0x00000002, 0x90000000),
+ (0x00000002, 0x70000000),
+ (0x00000002, 0xA0000000),
+ (0x00000003, 0x00004000),
+ (0x00000002, 0xD0000000),
+ (0x00000003, 0x20000000),
+ (0x00000003, 0x90000000),
+ (0x00000003, 0x70000000),
+ (0x00000003, 0xA0000000),
+ (0x00000004, 0x00004000),
+ (0x00000003, 0xD0000000),
+]
+
+
+# Easier test data with small jumps <= 0x30000000
+SNE_DATA_EASY = [
+ (0x00000000, 0x00000000),
+ (0x00000000, 0x30000000),
+ (0x00000000, 0x60000000),
+ (0x00000000, 0x80000000),
+ (0x00000000, 0x90000000),
+ (0x00000000, 0xC0000000),
+ (0x00000000, 0xF0000000),
+ (0x00000001, 0x10000000),
+ (0x00000000, 0xF0030000),
+ (0x00000001, 0x00030000),
+ (0x00000001, 0x10030000),
+]
+
+
+def check_sne_alg(alg, data):
+ for sne, seq in data:
+ observed_sne = alg.calc(seq)
+ logger.info(
+ "seq %08x expected sne %08x observed sne %08x", seq, sne, observed_sne
+ )
+ assert observed_sne == sne
+
+
+def test_sne_alg():
+ check_sne_alg(SequenceNumberExtender(), _SNE_TEST_DATA)
+
+
+def test_sne_alg_easy():
+ check_sne_alg(SequenceNumberExtender(), SNE_DATA_EASY)
+
+
+@pytest.mark.xfail
+def test_sne_alg_rfc():
+ check_sne_alg(SequenceNumberExtenderRFC(), _SNE_TEST_DATA)
+
+
+@pytest.mark.xfail
+def test_sne_alg_rfc_easy():
+ check_sne_alg(SequenceNumberExtenderRFC(), SNE_DATA_EASY)
+
+
+def test_sne_alg_linux():
+ check_sne_alg(SequenceNumberExtenderLinux(), _SNE_TEST_DATA)
+ check_sne_alg(SequenceNumberExtenderLinux(), SNE_DATA_EASY)
--
2.25.1
next prev parent reply other threads:[~2021-11-01 16:36 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-01 16:34 [PATCH v2] tcp: Initial support for RFC5925 auth option Leonard Crestez
2021-11-01 16:34 ` [PATCH v2 01/25] tcp: authopt: Initial support and key management Leonard Crestez
2021-11-03 2:29 ` David Ahern
2021-11-05 12:10 ` Leonard Crestez
2021-11-05 1:22 ` Dmitry Safonov
2021-11-05 7:04 ` Leonard Crestez
2021-11-05 14:50 ` Dmitry Safonov
2021-11-05 18:00 ` Leonard Crestez
2021-11-01 16:34 ` [PATCH v2 02/25] docs: Add user documentation for tcp_authopt Leonard Crestez
2021-11-01 16:34 ` [PATCH v2 03/25] selftests: Initial tcp_authopt test module Leonard Crestez
2021-11-01 16:34 ` [PATCH v2 04/25] selftests: tcp_authopt: Initial sockopt manipulation Leonard Crestez
2021-11-01 16:34 ` [PATCH v2 05/25] tcp: authopt: Add crypto initialization Leonard Crestez
2021-11-01 16:34 ` [PATCH v2 06/25] tcp: authopt: Compute packet signatures Leonard Crestez
2021-11-05 1:53 ` Dmitry Safonov
2021-11-05 6:39 ` Leonard Crestez
2021-11-05 2:08 ` Dmitry Safonov
2021-11-05 6:09 ` Leonard Crestez
2021-11-01 16:34 ` [PATCH v2 07/25] tcp: Use BIT() for OPTION_* constants Leonard Crestez
2021-11-03 2:31 ` David Ahern
2021-11-03 22:19 ` Leonard Crestez
2021-11-01 16:34 ` [PATCH v2 08/25] tcp: authopt: Hook into tcp core Leonard Crestez
2021-11-01 16:34 ` [PATCH v2 09/25] tcp: authopt: Disable via sysctl by default Leonard Crestez
2021-11-03 2:39 ` David Ahern
2021-11-05 8:50 ` Leonard Crestez
2021-11-05 1:46 ` Dmitry Safonov
2021-11-01 16:34 ` [PATCH v2 10/25] selftests: tcp_authopt: Test key address binding Leonard Crestez
2021-11-01 16:34 ` [PATCH v2 11/25] tcp: authopt: Implement Sequence Number Extension Leonard Crestez
2021-11-01 19:22 ` Francesco Ruggeri
2021-11-02 10:03 ` Leonard Crestez
2021-11-02 19:21 ` Francesco Ruggeri
2021-11-03 22:01 ` Leonard Crestez
2021-11-01 20:54 ` Eric Dumazet
2021-11-02 9:50 ` Leonard Crestez
2021-11-01 16:34 ` [PATCH v2 12/25] tcp: ipv6: Add AO signing for tcp_v6_send_response Leonard Crestez
2021-11-03 2:44 ` David Ahern
2021-11-03 22:09 ` Leonard Crestez
2021-11-01 16:34 ` [PATCH v2 13/25] tcp: authopt: Add support for signing skb-less replies Leonard Crestez
2021-11-01 16:34 ` [PATCH v2 14/25] tcp: ipv4: Add AO signing for " Leonard Crestez
2021-11-01 16:34 ` Leonard Crestez [this message]
2021-11-01 16:34 ` [PATCH v2 16/25] selftests: tcp_authopt: Add scapy-based packet signing code Leonard Crestez
2021-11-01 16:34 ` [PATCH v2 17/25] selftests: tcp_authopt: Add packet-level tests Leonard Crestez
2021-11-01 16:34 ` [PATCH v2 18/25] selftests: tcp_authopt: Initial sne test Leonard Crestez
2021-11-01 16:34 ` [PATCH v2 19/25] tcp: authopt: Add key selection controls Leonard Crestez
2021-11-01 16:34 ` [PATCH v2 20/25] selftests: tcp_authopt: Add tests for rollover Leonard Crestez
2021-11-01 16:34 ` [PATCH v2 21/25] tcp: authopt: Add initial l3index support Leonard Crestez
2021-11-03 3:06 ` David Ahern
2021-11-05 12:26 ` Leonard Crestez
2021-11-01 16:34 ` [PATCH v2 22/25] selftests: tcp_authopt: Initial tests for l3mdev handling Leonard Crestez
2021-11-01 16:34 ` [PATCH v2 23/25] selftests: nettest: Rename md5_prefix to key_addr_prefix Leonard Crestez
2021-11-03 3:08 ` David Ahern
2021-11-01 16:34 ` [PATCH v2 24/25] selftests: nettest: Initial tcp_authopt support Leonard Crestez
2021-11-03 3:09 ` David Ahern
2021-11-01 16:35 ` [PATCH v2 25/25] selftests: net/fcnal: " Leonard Crestez
2021-11-03 3:18 ` [PATCH v2] tcp: Initial support for RFC5925 auth option David Ahern
2021-11-03 22:22 ` Leonard Crestez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ce875c2c65a2bdc181bd2a4b38d5dee45d49ab66.1635784253.git.cdleonard@gmail.com \
--to=cdleonard@gmail.com \
--cc=0x7f454c46@gmail.com \
--cc=colona@arista.com \
--cc=cpaasch@apple.com \
--cc=davem@davemloft.net \
--cc=dsahern@kernel.org \
--cc=edumazet@google.com \
--cc=fruggeri@arista.com \
--cc=herbert@gondor.apana.org.au \
--cc=kuba@kernel.org \
--cc=kuniyu@amazon.co.jp \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=mathew.j.martineau@linux.intel.com \
--cc=netdev@vger.kernel.org \
--cc=priyarjha@google.com \
--cc=shuah@kernel.org \
--cc=ycheng@google.com \
--cc=yoshfuji@linux-ipv6.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).