manual commit: fix bignum_to_string buffer lengths

Author: mwhicks1

bn.c

@@ -124,7 +124,7 @@ void bignum_from_string(_Ptr<struct bn> n, _Nt_array_ptr<char> str : count(nbyte
 }
 
 
-void bignum_to_string(_Ptr<struct bn> n, char *str : itype(_Array_ptr<char>) count(8191), int nbytes)
+void bignum_to_string(_Ptr<struct bn> n, char *str : itype(_Array_ptr<char>) count(nbytes), int nbytes)
 {
   require(n, "n is null");
   require(str, "str is null");

bn.h

@@ -91,7 +91,7 @@ void bignum_init(_Ptr<struct bn> n);
 void bignum_from_int(_Ptr<struct bn> n, DTYPE_TMP i);
 int  bignum_to_int(_Ptr<struct bn> n);
 void bignum_from_string(_Ptr<struct bn> n, _Nt_array_ptr<char> str : count(nbytes), int nbytes);
-void bignum_to_string(_Ptr<struct bn> n, char *str : itype(_Array_ptr<char>) count(8191), int maxsize);
+void bignum_to_string(_Ptr<struct bn> n, char *str : itype(_Array_ptr<char>) count(maxsize), int maxsize);
 
 /* Basic arithmetic operations: */
 void bignum_add(_Ptr<struct bn> a, _Ptr<struct bn> b, _Ptr<struct bn> c); /* c = a + b */

tests/factorial.c

@@ -66,11 +66,11 @@ int main(int argc, _Array_ptr<_Nt_array_ptr<char>> argv : count(argc))
 {
   struct bn num = {};
   struct bn result = {};
-  char buf _Nt_checked[8192];
+  char buf _Nt_checked[8193];
 
   bignum_from_int(&num, 100);
   factorial(&num, &result);
-  bignum_to_string(&result, buf, sizeof(buf));
+  bignum_to_string(&result, buf, sizeof(buf)-1);
   printf("factorial(100) using bignum = %s\n", buf);
 
   return 0;

tests/golden.c

@@ -193,7 +193,7 @@ struct bn sc = {};
 struct bn sd = {};
   uint32_t ia, ib, ic;
   char op;
-  char buf _Nt_checked[8192];
+  char buf _Nt_checked[8193];
   int npassed = 0;
   int test_passed;
 
@@ -256,13 +256,13 @@ struct bn sd = {};
     }
     else
     {
-      bignum_to_string(&sa, buf, sizeof(buf));
+      bignum_to_string(&sa, buf, sizeof(buf)-1);
       printf("    a = %s \n", buf);
-      bignum_to_string(&sb, buf, sizeof(buf));
+      bignum_to_string(&sb, buf, sizeof(buf)-1);
       printf("    b = %s \n", buf);
-      bignum_to_string(&sc, buf, sizeof(buf));
+      bignum_to_string(&sc, buf, sizeof(buf)-1);
       printf("    c = %s \n", buf);
-      bignum_to_string(&sd, buf, sizeof(buf));
+      bignum_to_string(&sd, buf, sizeof(buf)-1);
       printf("    d = %s \n", buf);
       printf("\n");
     }

tests/load_cmp.c

@@ -15,14 +15,14 @@
 
 int main(int argc, _Array_ptr<_Nt_array_ptr<char>> argv : count(argc))
 {
-  char sabuf _Nt_checked[8192];
-  char sbbuf _Nt_checked[8192];
-  char scbuf _Nt_checked[8192];
-  char sdbuf _Nt_checked[8192];
-  char iabuf _Nt_checked[8192];
-  char ibbuf _Nt_checked[8192];
-  char icbuf _Nt_checked[8192];
-  char idbuf _Nt_checked[8192];
+  char sabuf _Nt_checked[8193];
+  char sbbuf _Nt_checked[8193];
+  char scbuf _Nt_checked[8193];
+  char sdbuf _Nt_checked[8193];
+  char iabuf _Nt_checked[8193];
+  char ibbuf _Nt_checked[8193];
+  char icbuf _Nt_checked[8193];
+  char idbuf _Nt_checked[8193];
 
   struct bn sa = {};
 struct bn sb = {};
@@ -80,15 +80,15 @@ struct bn id = {};
 
   printf("Verifying to_string function.\n");
 
-  bignum_to_string(&sa, sabuf, sizeof(sabuf));
-  bignum_to_string(&sb, sbbuf, sizeof(sbbuf));
-  bignum_to_string(&sc, scbuf, sizeof(scbuf));
-  bignum_to_string(&sd, sdbuf, sizeof(sdbuf));
+  bignum_to_string(&sa, sabuf, sizeof(sabuf)-1);
+  bignum_to_string(&sb, sbbuf, sizeof(sbbuf)-1);
+  bignum_to_string(&sc, scbuf, sizeof(scbuf)-1);
+  bignum_to_string(&sd, sdbuf, sizeof(sdbuf)-1);
 
-  bignum_to_string(&ia, iabuf, sizeof(iabuf));
-  bignum_to_string(&ib, ibbuf, sizeof(ibbuf));
-  bignum_to_string(&ic, icbuf, sizeof(icbuf));
-  bignum_to_string(&id, idbuf, sizeof(idbuf));
+  bignum_to_string(&ia, iabuf, sizeof(iabuf)-1);
+  bignum_to_string(&ib, ibbuf, sizeof(ibbuf)-1);
+  bignum_to_string(&ic, icbuf, sizeof(icbuf)-1);
+  bignum_to_string(&id, idbuf, sizeof(idbuf)-1);
 
   assert(strcmp(sabuf, iabuf) == 0);
   assert(strcmp(sbbuf, ibbuf) == 0);

tests/randomized.c

@@ -83,8 +83,8 @@ struct bn b_before = {};
 
   if (!cmp_result)
   {
-    char buf _Nt_checked[8192];
-    bignum_to_string(&res, buf, sizeof(buf));
+    char buf _Nt_checked[8193];
+    bignum_to_string(&res, buf, sizeof(buf)-1);
     printf("\ngot %s\n", buf);
     printf(" a  = %d \n", bignum_to_int(&a));
     printf(" b  = %d \n", bignum_to_int(&b));

tests/rsa.c

@@ -72,7 +72,7 @@ void pow_mod_faster(_Ptr<struct bn> a, _Ptr<struct bn> b, _Ptr<struct bn> n, _Pt
 static void test_rsa_1(void)
 {
   /* Testing with very small and simple terms */
-  char buf _Nt_checked[8192];
+  char buf _Nt_checked[8193];
   struct bn M = {};
 struct bn C = {};
 struct bn E = {};
@@ -109,7 +109,7 @@ struct bn N = {};
   bignum_from_int(&N, n);
   pow_mod_faster(&M, &E, &N, &C);
   c_result = bignum_to_int(&C);
-  bignum_to_string(&C, buf, sizeof(buf));
+  bignum_to_string(&C, buf, sizeof(buf)-1);
   printf("  %d ^ %d mod %d = %d \n", m, e, n, c_result);
   printf("  %d ^ %d mod %d = %s \n", m, e, n, buf);
 
@@ -119,7 +119,7 @@ struct bn N = {};
   printf("  %d ^ %d mod %d = %d ? \n", c, d, n, m);
   pow_mod_faster(&C, &D, &N, &M);
   m_result = bignum_to_int(&M);
-  bignum_to_string(&M, buf, sizeof(buf));
+  bignum_to_string(&M, buf, sizeof(buf)-1);
   printf("  %d ^ %d mod %d = %d \n", c, d, n, m_result);
   printf("  %d ^ %d mod %d = %s \n", c, d, n, buf);
 
@@ -132,7 +132,7 @@ struct bn N = {};
 
 void test_rsa_2(void)
 {
-  char buf _Nt_checked[8192];
+  char buf _Nt_checked[8193];
   struct bn M = {};
 struct bn C = {};
 struct bn E = {};
@@ -169,7 +169,7 @@ struct bn N = {};
   bignum_from_int(&N, n);
   pow_mod_faster(&M, &E, &N, &C);
   c_result = bignum_to_int(&C);
-  bignum_to_string(&C, buf, sizeof(buf));
+  bignum_to_string(&C, buf, sizeof(buf)-1);
   printf("  %d ^ %d mod %d = %d \n", m, e, n, c_result);
   printf("  %d ^ %d mod %d = %s \n", m, e, n, buf);
 
@@ -179,7 +179,7 @@ struct bn N = {};
   printf("  %d ^ %d mod %d = %d ? \n", c, d, n, m);
   pow_mod_faster(&C, &D, &N, &M);
   m_result = bignum_to_int(&M);
-  bignum_to_string(&M, buf, sizeof(buf));
+  bignum_to_string(&M, buf, sizeof(buf)-1);
   printf("  %d ^ %d mod %d = %s \n", c, d, n, buf);
   printf("  %d ^ %d mod %d = %d \n", c, d, n, m_result);
 
@@ -189,7 +189,7 @@ struct bn N = {};
 
 void test_rsa_3(void)
 {
-  char buf _Nt_checked[8192];
+  char buf _Nt_checked[8193];
   struct bn M = {};
 struct bn C = {};
 struct bn E = {};
@@ -226,7 +226,7 @@ struct bn N = {};
   bignum_from_int(&N, n);
   pow_mod_faster(&M, &E, &N, &C);
   c_result = bignum_to_int(&C);
-  bignum_to_string(&C, buf, sizeof(buf));
+  bignum_to_string(&C, buf, sizeof(buf)-1);
   printf("  %d ^ %d mod %d = %d \n", m, e, n, c_result);
   printf("  %d ^ %d mod %d = %s \n", m, e, n, buf);
 
@@ -236,7 +236,7 @@ struct bn N = {};
   printf("  %d ^ %d mod %d = %d ? \n", c, d, n, m);
   pow_mod_faster(&C, &D, &N, &M);
   m_result = bignum_to_int(&M);
-  bignum_to_string(&M, buf, sizeof(buf));
+  bignum_to_string(&M, buf, sizeof(buf)-1);
   printf("  %d ^ %d mod %d = %s \n", c, d, n, buf);
   printf("  %d ^ %d mod %d = %d \n", c, d, n, m_result);
 
@@ -250,7 +250,7 @@ static void test_rsa1024(void)
 {
   char public _Nt_checked[]  = "a15f36fc7f8d188057fc51751962a5977118fa2ad4ced249c039ce36c8d1bd275273f1edd821892fa75680b1ae38749fff9268bf06b3c2af02bbdb52a0d05c2ae2384aa1002391c4b16b87caea8296cfd43757bb51373412e8fe5df2e56370505b692cf8d966e3f16bc62629874a0464a9710e4a0718637a68442e0eb1648ec5";
   char private _Nt_checked[] = "3f5cc8956a6bf773e598604faf71097e265d5d55560c038c0bdb66ba222e20ac80f69fc6f93769cb795440e2037b8d67898d6e6d9b6f180169fc6348d5761ac9e81f6b8879529bc07c28dc92609eb8a4d15ac4ba3168a331403c689b1e82f62518c38601d58fd628fcb7009f139fb98e61ef7a23bee4e3d50af709638c24133d";
-  char buf _Nt_checked[8192];
+  char buf _Nt_checked[8193];
 
   struct bn n = {}; /* public  key */
   struct bn d = {}; /* private key */
@@ -276,7 +276,7 @@ static void test_rsa1024(void)
   bignum_init(&c);
 
   bignum_from_int(&m, x);
-  bignum_to_string(&m, buf, sizeof(buf));
+  bignum_to_string(&m, buf, sizeof(buf)-1);
   printf("m = %s \n", buf);
 
 //printf("  Copied %d bytes into m\n", i);
@@ -285,7 +285,7 @@ static void test_rsa1024(void)
   pow_mod_faster(&m, &e, &n, &c);
   printf("  Done...\n\n");
 
-  bignum_to_string(&c, buf, sizeof(buf));
+  bignum_to_string(&c, buf, sizeof(buf)-1);
   printf("  Decrypting cipher text '");
   int i = 0;
   while (buf[i] != 0)
@@ -302,7 +302,7 @@ static void test_rsa1024(void)
   printf("  Done...\n\n");
 
 
-  bignum_to_string(&m, buf, sizeof(buf));
+  bignum_to_string(&m, buf, sizeof(buf)-1);
   printf("m = %s \n", buf);
 }