From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 17 Mar 2020 14:07:54 +0000 (-0400)
Subject: Add off-by-one checks for key length.
X-Git-Tag: tor-0.3.5.10~3^2^2~1
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=2328c79a5fbc2f1995390dd08002244bc952246d;p=thirdparty%2Ftor.git

Add off-by-one checks for key length.
---

diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c
index 2373e5bf86..5af0cce130 100644
--- a/src/test/test_crypto.c
+++ b/src/test/test_crypto.c
@@ -1505,6 +1505,21 @@ test_crypto_pk_bad_size(void *arg)
   pk2 = crypto_pk_asn1_decode_private(buf, n, 1020);
   tt_assert(! pk2);
 
+  /* Set the max bit count one bit smaller: we should refuse to decode the
+     key.*/
+  pk2 = crypto_pk_asn1_decode_private(buf, n, 1023);
+  tt_assert(! pk2);
+
+  /* Correct size: should work. */
+  pk2 = crypto_pk_asn1_decode_private(buf, n, 1024);
+  tt_assert(pk2);
+  crypto_pk_free(pk2);
+
+  /* One bit larger: should work. */
+  pk2 = crypto_pk_asn1_decode_private(buf, n, 1025);
+  tt_assert(pk2);
+  crypto_pk_free(pk2);
+
   /* Set the max bit count larger: it should decode fine. */
   pk2 = crypto_pk_asn1_decode_private(buf, n, 2048);
   tt_assert(pk2);