From: "plaisthos (Code Review)" Date: Sat, 4 Jan 2025 22:51:55 +0000 In-Reply-To: References: Reply-To: arne-openvpn@...1227..., openvpn-devel@lists.sourceforge.net, frank@...2641..., max@...2606... Message-ID: <322eeca81814a3696b47b77a205c5e5b31be7651-EmailReplacePatchSet-HTML@...2715...> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline Content-Type: multipart/alternative; boundary="JM1NB2xvjnQ="; charset=UTF-8 Subject: [Openvpn-devel] [S] Change in openvpn[master]: Do not attempt to decrypt packets anymore after 2**36 failed decryptions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: flichtenheld , MaxF Cc: openvpn-devel --JM1NB2xvjnQ= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Attention is currently required from: MaxF, flichtenheld. Hello MaxF, flichtenheld, I'd like you to reexamine a change. Please visit http://gerrit.openvpn.net/c/openvpn/+/843?usp=3Demail to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review-1 by MaxF Change subject: Do not attempt to decrypt packets anymore after 2**36 faile= d decryptions ...................................................................... Do not attempt to decrypt packets anymore after 2**36 failed decryptions To avoid attacks (especially on Chacha20-Poly1305) we do not allow decryption anymore after 2**36 failed verifications. Change-Id: I81440ac28a1ad553652e201234e5ddfe03a8c190 Signed-off-by: Arne Schwabe --- M src/openvpn/crypto.c M src/openvpn/crypto.h M src/openvpn/ssl.c 3 files changed, 41 insertions(+), 1 deletion(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/43/843/4 diff --git a/src/openvpn/crypto.c b/src/openvpn/crypto.c index df38cdd..ee9b0c6 100644 --- a/src/openvpn/crypto.c +++ b/src/openvpn/crypto.c @@ -405,7 +405,13 @@ { static const char error_prefix[] =3D "AEAD Decrypt error"; struct packet_id_net pin =3D { 0 }; - const struct key_ctx *ctx =3D &opt->key_ctx_bi.decrypt; + struct key_ctx *ctx =3D &opt->key_ctx_bi.decrypt; + + if (cipher_decrypt_verify_fail_exceeded(ctx)) + { + CRYPT_DROP("Decryption failed verification limit reached."); + } + int outlen; struct gc_arena gc; @@ -511,6 +517,7 @@ if (!cipher_ctx_final_check_tag(ctx->cipher, BPTR(&work) + outlen, &outlen, tag_ptr, tag_size)) { + ctx->failed_verifications++; CRYPT_DROP("packet tag authentication failed"); } ASSERT(buf_inc_len(&work, outlen)); diff --git a/src/openvpn/crypto.h b/src/openvpn/crypto.h index 3ad31c5..fe81c7f 100644 --- a/src/openvpn/crypto.h +++ b/src/openvpn/crypto.h @@ -209,6 +209,8 @@ * with the current key in number of 128 bit blocks (only used for * AEAD ciphers) */ uint64_t plaintext_blocks; + /** number of failed verification using this cipher */ + uint64_t failed_verifications; }; #define KEY_DIRECTION_BIDIRECTIONAL 0 /* same keys for both directions */ @@ -661,6 +663,32 @@ cipher_get_aead_limits(const char *ciphername); /** + * Check if the number of failed decryption is over the acceptable limit. + */ +static inline bool +cipher_decrypt_verify_fail_exceeded(const struct key_ctx *ctx) +{ + /* Use 2**36, same as DTLS 1.3. Strictly speaking this only guarantees + * the security margin for packets up to 2^10 blocks (16384 bytes) + * but we accept slightly lower security bound for the edge + * of Chacha20-Poly1305 and packets over 16k as MTUs over 16k are + * extremely rarely used */ + return ctx->failed_verifications > (1ull << 36); +} + +/** + * Check if the number of failed decryption is approaching the limit and we + * should try to move to a new key + */ +static inline bool +cipher_decrypt_verify_fail_warn(const struct key_ctx *ctx) +{ + /* Use 2**35, half the amount after which we refuse to decrypt */ + return ctx->failed_verifications > (1ull << 35); +} + + +/** * Blocksize used for the AEAD limit caluclation * * Since cipher_ctx_block_size() is not reliable and will return 1 in many diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c index cf7f34f..e4a7b57 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -3005,6 +3005,11 @@ return true; } + if (cipher_decrypt_verify_fail_warn(&key_ctx_bi->decrypt)) + { + return true; + } + return false; } /* -- To view, visit http://gerrit.openvpn.net/c/openvpn/+/843?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: I81440ac28a1ad553652e201234e5ddfe03a8c190 Gerrit-Change-Number: 843 Gerrit-PatchSet: 4 Gerrit-Owner: plaisthos Gerrit-Reviewer: MaxF Gerrit-Reviewer: flichtenheld Gerrit-CC: openvpn-devel Gerrit-Attention: flichtenheld Gerrit-Attention: MaxF Gerrit-MessageType: newpatchset --JM1NB2xvjnQ= Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable

Attention is currently required from: MaxF, flichtenheld.

plaisthos uploaded patch set #4 to this change.

<= a href=3D"http://gerrit.openvpn.net/c/openvpn/+/843?usp=3Demail">View Chang= e

The following approvals got outdated and were removed: Code-Review-1 by MaxF

Do not attempt to decrypt packets anymore after 2**36=
 failed decryptions

To avoid attacks (especially on Chacha20-Poly130= 5) we do not allow
decryption anymore after 2**36 failed verifications.<= br>
Change-Id: I81440ac28a1ad553652e201234e5ddfe03a8c190
Signed-off-b= y: Arne Schwabe <arne@...1227...>
---
M src/openvpn/crypto.cM src/openvpn/crypto.h
M src/openvpn/ssl.c
3 files changed, 41 inser= tions(+), 1 deletion(-)

git pull ssh://gerrit.openvpn.net:29418/o=
penvpn refs/changes/43/843/4
diff --git a/src/openvpn/crypto.c b/sr=
c/openvpn/crypto.c
index df38cdd..ee9b0c6 100644
= --- a/src/openvpn/crypto.c
+++ b/src/openvpn/crypto.c=
@@ -405,7 +405,13 @@
{
= static const char error_prefix[] =3D "AEAD Decrypt error";
struct packet_id_net pin =3D { 0 };
- const struct key_ctx *ctx =3D &opt-= >key_ctx_bi.decrypt;
+ struct key_ctx *ctx =3D &opt->key_ctx_bi.decrypt;
= +
+ if (cipher_decrypt_verify_fail_exceeded(ctx))=
+ {
+ CRYPT_DROP("Decrypti= on failed verification limit reached.");

+ }
+
int outlen;
struct g= c_arena gc;

@@ -511,6 +517,7 @@ if (!cipher_ctx_final_check_tag(ctx->cipher, BPTR(&work)= + outlen,
&outlen= , tag_ptr, tag_size))
{
+ ctx->failed_verifications++;
= CRYPT_DROP("packet tag authentication failed");
}
ASSERT(buf_inc_len(&work, out= len));
diff --git a/src/openvpn/crypto.h b/src/openvpn/cryp= to.h
index 3ad31c5..fe81c7f 100644
--- a/sr= c/openvpn/crypto.h
+++ b/src/openvpn/crypto.h
@@ -209,6 +209,8 @@

* with the current key in numb= er of 128 bit blocks (only used for
* AEAD ciphers) *= /
uint64_t plaintext_blocks;
+ /** number of failed verification using t= his cipher */
+ ui= nt64_t failed_verifications;
};
#define KEY_DIRECTION_BIDIRECTIONAL 0 /* same keys for both direct= ions */
@@ -661,6 +663,32 @@
cipher_get_ae= ad_limits(const char *ciphername);

/**
+ * Check if the numbe= r of failed decryption is over the acceptable limit.
+ */
+static inline bool
+cipher_decrypt_verify_fail_exceeded(const struct key_ctx *= ctx)
+{
+ /* Use 2**36, same as DTLS 1.= 3. Strictly speaking this only guarantees

+ * the security margin for packets up to 2^10 blo= cks (16384 bytes)
+ = * but we accept slightly lower security bound for the edge
+ * of Chacha20-Poly1305 and p= ackets over 16k as MTUs over 16k are
+ * extremely rarely used */
+ return ctx->failed_verifications > = (1ull << 36);
+= }
+
+/**
+ * Check if the number of failed decryption is approa= ching the limit and we
+ */
+static inline bool
= +cipher_decrypt_verify_fail_warn(const struct key_ctx *ctx)
+{
+ /* Use 2**35, half the amount after which we refu= se to decrypt */
+ = return ctx->failed_verifications > (1ull << 35);
+}
+
+
+/** * Blocksize used for the AEAD limit caluclation
= *
* Since cipher_ctx_block_size() is not reliable and wil= l return 1 in many
diff --git a/src/openvpn/ssl.c b/src/ope= nvpn/ssl.c
index cf7f34f..e4a7b57 100644
--= - a/src/openvpn/ssl.c
+++ b/src/openvpn/ssl.c
@@ -3005,6 +3005,11 @@
return true;
<= span> }

+ if (cipher_decrypt_verify_fail_warn(&key_ctx_bi->decry= pt))
+ {+ return true;+ }
+
return false;

}
/*

To vi= ew, visit change 843. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I81440ac28a1ad553652e201234e= 5ddfe03a8c190
Gerrit-Change-Number: 843
Gerrit-PatchSet: 4
Gerrit-Owner: plaisthos <arne-openvpn@...1711...= 27...>
Gerrit-Reviewer: MaxF <max@...2606...> <= /div>
Gerrit-Reviewer: flichtenheld <frank@...2716...= 1...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...= ts.sourceforge.net>
Gerrit-Attention: flichtenheld <frank@...2375...= 41...>
Gerrit-Attention: MaxF <max@...2606...> =
Gerrit-MessageType: newpatchset
--JM1NB2xvjnQ=--