From: "MaxF (Code Review)"
Date: Sun, 29 Dec 2024 00:42:46 +0000
In-Reply-To:
References:
Reply-To: max@...2606..., arne-openvpn@...1227...,
openvpn-devel@lists.sourceforge.net, frank@...2641...
Message-ID:
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
Content-Type: multipart/alternative; boundary="i/VnNFVecsY="; charset=UTF-8
Subject: [Openvpn-devel] [L] Change in openvpn[master]: Implement methods to
generate and manage OpenVPN Epoch keys
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
To: plaisthos
Cc: flichtenheld , openvpn-devel
--i/VnNFVecsY=
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: flichtenheld, plaisthos.
MaxF has posted comments on this change. ( http://gerrit.openvpn.net/c/open=
vpn/+/804?usp=3Demail )
Change subject: Implement methods to generate and manage OpenVPN Epoch keys
......................................................................
Patch Set 9: Code-Review-1
(13 comments)
Patchset:
PS9:
Needs uncrustification.
Code looks good to me, I just have some comments about comments and naming.
File src/openvpn/crypto.h:
http://gerrit.openvpn.net/c/openvpn/+/804/comment/71ce8066_a53680c4 :
PS9, Line 307: This limit for AEAD cipher
The limit for AEAD ciphers?
File src/openvpn/crypto_epoch.c:
http://gerrit.openvpn.net/c/openvpn/+/804/comment/4fc082c6_eb80eb11 :
PS9, Line 136: 11
We could use strlen() here.
http://gerrit.openvpn.net/c/openvpn/+/804/comment/8fdb0547_fcd70ff2 :
PS9, Line 157: 8
strlen?
http://gerrit.openvpn.net/c/openvpn/+/804/comment/403bd9f7_0bc3e36d :
PS9, Line 163: 7
strlen?
http://gerrit.openvpn.net/c/openvpn/+/804/comment/769c056a_676d4fc5 :
PS9, Line 210: uint16_t current_epoch_recv =3D co->key_ctx_bi.decrypt.epoch;
The variable name makes this look like it should be co->epoch_key_recv.epoc=
h.
After reading the function, I think the code is correct, but together with =
the ASSERT below, this caused me a lot of confusion. I thought that the ass=
ert was saying that you can only generate new future keys if you used them =
all up.
http://gerrit.openvpn.net/c/openvpn/+/804/comment/dcaea617_c7f7124b :
PS9, Line 423: is
in?
File src/openvpn/packet_id.h:
http://gerrit.openvpn.net/c/openvpn/+/804/comment/7be792f3_fe78b9b2 :
PS9, Line 214: */
Incomplete
File src/openvpn/packet_id.c:
http://gerrit.openvpn.net/c/openvpn/+/804/comment/bf06e613_bc17423a :
PS9, Line 81: packet_id_init_recv(struct packet_id_rec *rec, int seq_backtr=
ack, int time_backtrack, const char *name, int unit)
You could make this a static function.
File tests/unit_tests/openvpn/test_crypto.c:
http://gerrit.openvpn.net/c/openvpn/+/804/comment/7799a129_e434234f :
PS9, Line 728: is uses
uses
http://gerrit.openvpn.net/c/openvpn/+/804/comment/e365ffa5_5d07eb01 :
PS9, Line 830: 1-5
2-6
http://gerrit.openvpn.net/c/openvpn/+/804/comment/c9e49297_c1a18bdd :
PS9, Line 835: assert_int_equal(epoch_lookup_decrypt_key(co, 1)->epoch,=
1);
Could we make sure that it really is the retiring key by comparing it with =
&co->epoch_retiring_data_receive_key?
Similar for epoch 7 and &co->key_ctx_bi.decrypt
http://gerrit.openvpn.net/c/openvpn/+/804/comment/a1b07fcd_530357a4 :
PS9, Line 899: assert_null(epoch_lookup_decrypt_key(co, UINT16_MAX - 32=
));
This hard-codes the assumption that this function is called with a state th=
at has num_future_keys =3D=3D 32. Can't we get that number from co instead?
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/804?usp=3Demail
To unsubscribe, or for help writing mail filters, visit http://gerrit.openv=
pn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Id7d6a576ca8c9560cb2dfae82fc62175820e9b80
Gerrit-Change-Number: 804
Gerrit-PatchSet: 9
Gerrit-Owner: plaisthos
Gerrit-Reviewer: MaxF
Gerrit-Reviewer: flichtenheld
Gerrit-CC: openvpn-devel
Gerrit-Attention: plaisthos
Gerrit-Attention: flichtenheld
Gerrit-Comment-Date: Sun, 29 Dec 2024 00:42:46 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
--i/VnNFVecsY=
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: flichtenheld, plaisthos.
The variable name makes this look like it should be co->epoch_key=
_recv.epoch.
=
After reading the function, I think the code is correct, but together with =
the ASSERT below, this caused me a lot of confusion. I thought that the ass=
ert was saying that you can only generate new future keys if you used them =
all up.
This hard-codes the assumption that this function is called with a state =
that has num_future_keys =3D=3D 32. Can't we get that number from co in=
stead?
To view, visit change 804. To unsubscribe, or f=
or help writing mail filters, visit settings.