added clean-up for read_radix

Author: czurnieden

mp_read_radix.c

@@ -19,6 +19,10 @@ mp_err mp_read_radix(mp_int *a, const char *str, int radix)
 
    mp_err   err;
    mp_sign  sign = MP_ZPOS;
+   int correction = 0;
+   size_t slen;
+   /* should sit at the EOS now */
+   const char *t;
 
    /* make sure the radix is ok */
    if ((radix < 2) || (radix > 64)) {
@@ -33,14 +37,23 @@ mp_err mp_read_radix(mp_int *a, const char *str, int radix)
       sign = MP_NEG;
    }
 
+   slen = s_mp_strlen(str);
+   t = str + slen - 1;
+
+   /* Check input (needed to get rid of unclean input from "mtest") */
+   while ((*t == '\r') || (*t == '\n') || (*t == '\t')) {
+      correction++;
+      t--;
+   }
+
    mp_zero(a);
 
    /* Try faster version first */
    if (MP_HAS(S_MP_FASTER_READ_RADIX)) {
-      if ((err = s_mp_faster_read_radix(a, str, 0, (int)s_mp_strlen(str) - 1,
+      if ((err = s_mp_faster_read_radix(a, str, 0, (int)slen - correction,
                                         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)s_mp_strlen(str) - 1,
+      if ((err = s_mp_slower_read_radix(a, str, 0, (int)slen - correction,
                                         radix)) != MP_OKAY)                                              goto LTM_ERR;
    }
 

s_mp_slower_read_radix.c

@@ -11,23 +11,17 @@ mp_err s_mp_slower_read_radix(mp_int *a, const char *str, int start, int end, in
    /* checks are done by caller */
 
    char *_s = (char *)(str + start);
-   for (i = start; (i < end) && (*_s != '\0'); i++) {
+   for (i = start; (i < end) && (*_s != '\0')&& (*_s != '\r') && (*_s != '\n'); i++) {
       uint8_t y;
 
       char ch = (radix <= 36) ? (char)MP_TOUPPER((int)*_s) : *_s;
       unsigned int pos = (unsigned int)(ch - '+');
       if (MP_RADIX_MAP_REVERSE_SIZE <= pos) {
-         if ((*_s != '\0') && (*_s != '\r') && (*_s != '\n')) {
-            return MP_VAL;
-         }
-         break;
+         goto LBL_ERR;
       }
       y = s_mp_radix_map_reverse[pos];
       if (y >= radix) {
-         if ((*_s != '\0') && (*_s != '\r') && (*_s != '\n')) {
-            return MP_VAL;
-         }
-         break;
+         goto LBL_ERR;
       }
       if ((err = mp_mul_d(a, (mp_digit)radix, a)) != MP_OKAY)                                            goto LBL_ERR;
       if ((err = mp_add_d(a, (mp_digit)y, a)) != MP_OKAY)                                                goto LBL_ERR;