Corrected some data-types

Author: czurnieden

mp_read_radix.c

@@ -40,9 +40,9 @@ mp_err mp_read_radix(mp_int *a, const char *str, int radix)
 
    /* Try faster version first */
    if (MP_HAS(S_MP_FASTER_READ_RADIX)) {
-      if ((err = s_mp_faster_read_radix(a, str, 0, (int)slen, radix)) != MP_OKAY)                        goto LTM_ERR;
+      if ((err = s_mp_faster_read_radix(a, str, 0, slen, radix)) != MP_OKAY)                             goto LTM_ERR;
    } else if (MP_HAS(S_MP_SLOWER_READ_RADIX)) {
-      if ((err = s_mp_slower_read_radix(a, str, 0, (int)slen, radix)) != MP_OKAY)                        goto LTM_ERR;
+      if ((err = s_mp_slower_read_radix(a, str, 0, slen, radix)) != MP_OKAY)                             goto LTM_ERR;
    }
 
    /* set the sign only if a != 0 */

s_mp_faster_read_radix.c

@@ -28,9 +28,9 @@ static int s_floor_ilog2(int value)
    return r;
 }
 
-mp_err s_mp_faster_read_radix(mp_int *a, const char *str, int start, int end, int radix)
+mp_err s_mp_faster_read_radix(mp_int *a, const char *str, size_t start, size_t end, int radix)
 {
-   int len, mid;
+   size_t len, mid;
    mp_int A, B, m;
    mp_err err = MP_OKAY;
 
@@ -40,7 +40,7 @@ mp_err s_mp_faster_read_radix(mp_int *a, const char *str, int start, int end, in
       return s_mp_slower_read_radix(a, str, start, end, radix);
    }
 
-   mid = len / 2;
+   mid = len / 2u;
 
    if ((err = mp_init_set(&m, (mp_digit)radix)) != MP_OKAY) {
       return err;
@@ -51,12 +51,12 @@ mp_err s_mp_faster_read_radix(mp_int *a, const char *str, int start, int end, in
    }
 
    if ((err = s_mp_slower_read_radix(&A, str, start, start + mid + 1, radix)) != MP_OKAY)                goto LTM_ERR;
-   if ((err = s_mp_slower_read_radix(&B, str, start + mid +1, end, radix)) != MP_OKAY)                  goto LTM_ERR;
+   if ((err = s_mp_slower_read_radix(&B, str, start + mid +1, end, radix)) != MP_OKAY)                   goto LTM_ERR;
 
    if (MP_IS_2EXPT((unsigned int)radix)) {
-      if ((err = mp_mul_2d(&A, ((len - mid) -1) * s_floor_ilog2(radix), &A)) != MP_OKAY)                 goto LTM_ERR;
+      if ((err = mp_mul_2d(&A, ((len - mid) - 1u) * s_floor_ilog2(radix), &A)) != MP_OKAY)               goto LTM_ERR;
    } else {
-      if ((err = mp_expt_n(&m, (len - mid) - 1, &m)) != MP_OKAY)                                         goto LTM_ERR;
+      if ((err = mp_expt_n(&m, (len - mid) - 1u, &m)) != MP_OKAY)                                        goto LTM_ERR;
       if ((err = mp_mul(&A, &m, &A)) != MP_OKAY)                                                         goto LTM_ERR;
    }
    if ((err = mp_add(&A, &B, a)) != MP_OKAY)                                                             goto LTM_ERR;

s_mp_slower_read_radix.c

@@ -3,15 +3,15 @@
 /* LibTomMath, multiple-precision integer library -- Tom St Denis */
 /* SPDX-License-Identifier: Unlicense */
 
-mp_err s_mp_slower_read_radix(mp_int *a, const char *str, int start, int end, int radix)
+mp_err s_mp_slower_read_radix(mp_int *a, const char *str, size_t start, size_t end, int radix)
 {
    mp_err err;
-   int i;
+   size_t i;
 
    /* checks are done by caller */
 
    char *_s = (char *)(str + start);
-   for (i = start; (i < end) && (*_s != '\0')&& (*_s != '\r') && (*_s != '\n'); i++) {
+   for (i = start; (i < end) && (*_s != '\0'); i++) {
       uint8_t y;
 
       char ch = (radix <= 36) ? (char)MP_TOUPPER((int)*_s) : *_s;

tommath_private.h

@@ -210,11 +210,11 @@ MP_PRIVATE mp_err s_mp_radix_size_overestimate(const mp_int *a, const int radix,
 
 /* Radix conversion O(M(n) log n) Schoenhage method */
 MP_PRIVATE mp_err s_mp_faster_to_radix(const mp_int *a, char *str, size_t maxlen, size_t *written, int radix) MP_WUR;
-MP_PRIVATE mp_err s_mp_faster_read_radix(mp_int *a, const char *str, int start, int end, int radix) MP_WUR;
+MP_PRIVATE mp_err s_mp_faster_read_radix(mp_int *a, const char *str, size_t start, size_t end, int radix) MP_WUR;
 /* Radix conversion O(n^2) method */
 MP_PRIVATE mp_err s_mp_slower_to_radix(const mp_int *a, char **str, size_t *part_maxlen, size_t *part_written,
                                        int radix, bool pad) MP_WUR;
-MP_PRIVATE mp_err s_mp_slower_read_radix(mp_int *a, const char *str, int start, int end, int radix) MP_WUR;
+MP_PRIVATE mp_err s_mp_slower_read_radix(mp_int *a, const char *str, size_t start, size_t end, int radix) MP_WUR;