@@ -406,6 +406,7 @@ libclamav_la_SOURCES += bignum.h\

         tomsfastmath/bin/fp_to_signed_bin.c\

         tomsfastmath/bin/fp_to_unsigned_bin.c\

         tomsfastmath/bin/fp_toradix.c\

+        tomsfastmath/bin/fp_toradix_n.c\

         tomsfastmath/bin/fp_unsigned_bin_size.c\

         tomsfastmath/bit/fp_cnt_lsb.c\

         tomsfastmath/bit/fp_count_bits.c\

@@ -183,6 +183,7 @@ am_libclamav_la_OBJECTS = libclamav_la-matcher-ac.lo \

 	libclamav_la-fp_signed_bin_size.lo \

 	libclamav_la-fp_to_signed_bin.lo \

 	libclamav_la-fp_to_unsigned_bin.lo libclamav_la-fp_toradix.lo \

+	libclamav_la-fp_toradix_n.lo \

 	libclamav_la-fp_unsigned_bin_size.lo \

 	libclamav_la-fp_cnt_lsb.lo libclamav_la-fp_count_bits.lo \

 	libclamav_la-fp_div_2.lo libclamav_la-fp_div_2d.lo \

@@ -695,6 +696,7 @@ libclamav_la_SOURCES = clamav.h matcher-ac.c matcher-ac.h matcher-bm.c \

 	tomsfastmath/bin/fp_to_signed_bin.c \

 	tomsfastmath/bin/fp_to_unsigned_bin.c \

 	tomsfastmath/bin/fp_toradix.c \

+	tomsfastmath/bin/fp_toradix_n.c \

 	tomsfastmath/bin/fp_unsigned_bin_size.c \

 	tomsfastmath/bit/fp_cnt_lsb.c tomsfastmath/bit/fp_count_bits.c \

 	tomsfastmath/bit/fp_div_2.c tomsfastmath/bit/fp_div_2d.c \

@@ -984,6 +986,7 @@ distclean-compile:

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-fp_to_signed_bin.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-fp_to_unsigned_bin.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-fp_toradix.Plo@am__quote@

+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-fp_toradix_n.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-fp_unsigned_bin_size.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-fsg.Plo@am__quote@

 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libclamav_la-hashtab.Plo@am__quote@

@@ -2008,6 +2011,13 @@ libclamav_la-fp_toradix.lo: tomsfastmath/bin/fp_toradix.c

 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-fp_toradix.lo `test -f 'tomsfastmath/bin/fp_toradix.c' || echo '$(srcdir)/'`tomsfastmath/bin/fp_toradix.c

+libclamav_la-fp_toradix_n.lo: tomsfastmath/bin/fp_toradix_n.c

+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-fp_toradix_n.lo -MD -MP -MF $(DEPDIR)/libclamav_la-fp_toradix_n.Tpo -c -o libclamav_la-fp_toradix_n.lo `test -f 'tomsfastmath/bin/fp_toradix_n.c' || echo '$(srcdir)/'`tomsfastmath/bin/fp_toradix_n.c

+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-fp_toradix_n.Tpo $(DEPDIR)/libclamav_la-fp_toradix_n.Plo

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='tomsfastmath/bin/fp_toradix_n.c' object='libclamav_la-fp_toradix_n.lo' libtool=yes @AMDEPBACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@

+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -c -o libclamav_la-fp_toradix_n.lo `test -f 'tomsfastmath/bin/fp_toradix_n.c' || echo '$(srcdir)/'`tomsfastmath/bin/fp_toradix_n.c

+

 libclamav_la-fp_unsigned_bin_size.lo: tomsfastmath/bin/fp_unsigned_bin_size.c

 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libclamav_la_CFLAGS) $(CFLAGS) -MT libclamav_la-fp_unsigned_bin_size.lo -MD -MP -MF $(DEPDIR)/libclamav_la-fp_unsigned_bin_size.Tpo -c -o libclamav_la-fp_unsigned_bin_size.lo `test -f 'tomsfastmath/bin/fp_unsigned_bin_size.c' || echo '$(srcdir)/'`tomsfastmath/bin/fp_unsigned_bin_size.c

 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_la-fp_unsigned_bin_size.Tpo $(DEPDIR)/libclamav_la-fp_unsigned_bin_size.Plo

@@ -6,7 +6,7 @@

 #include "bignum_fast.h"

 typedef fp_int mp_int;

 #define mp_cmp fp_cmp

-#define mp_toradix_n(a,b,c,d) fp_toradix(a,b,c)

+#define mp_toradix_n(a,b,c,d) fp_toradix_n(a,b,c,d)

 #define mp_init(a) (fp_init(a), 0)

 #define mp_add fp_add

@@ -123,17 +123,22 @@ int crtmgr_add(crtmgr *m, cli_crt *x509) {

     m->crts = i;

     if(cli_debug_flag) {

-	char issuer[SHA1_HASH_SIZE*2+1], subject[SHA1_HASH_SIZE*2+1], mod[1024], exp[1024];

-	int j;

-	//mp_toradix_n(&i->n, mod, 16, sizeof(mod));

-	mod[0]='N'; mod[1]='/'; mod[2]='A'; mod[3]='\0';

-	//mp_toradix_n(&i->e, exp, 16, sizeof(exp));

-	exp[0]='N'; exp[1]='/'; exp[2]='A'; exp[3]='\0';

-	for(j=0; j<SHA1_HASH_SIZE; j++) {

-	    sprintf(&issuer[j*2], "%02x", i->issuer[j]);

-	    sprintf(&subject[j*2], "%02x", i->subject[j]);

-	}

-	cli_dbgmsg("crtmgr_add: added cert s:%s i:%s n:%s e:%s %lu->%lu %s%s%s\n", subject, issuer, mod, exp, (unsigned long)i->not_before, (unsigned long)i->not_after, i->certSign ? "cert ":"", i->codeSign ? "code ":"", i->timeSign ? "time":"");

+        char issuer[SHA1_HASH_SIZE*2+1], subject[SHA1_HASH_SIZE*2+1];

+        char mod[1024], exp[1024];

+        int j=1024;

+        // mod first

+        fp_toradix_n(&i->n, mod, 16, j);

+        // exp next

+        fp_toradix_n(&i->e, exp, 16, j);

+        // subject and issuer hashes

+        for(j=0; j<SHA1_HASH_SIZE; j++) {

+            sprintf(&issuer[j*2], "%02x", i->issuer[j]);

+            sprintf(&subject[j*2], "%02x", i->subject[j]);

+        }

+        // printing lines, broken up to minimize truncation

+        cli_dbgmsg("crtmgr_add: added cert s:%s i:%s %lu->%lu %s%s%s\n", subject, issuer, (unsigned long)i->not_before, (unsigned long)i->not_after, i->certSign ? "cert ":"", i->codeSign ? "code ":"", i->timeSign ? "time":"");

+        cli_dbgmsg("crtmgr_add: n:%s \n", mod);

+        cli_dbgmsg("crtmgr_add: e:%s \n", exp);

     }

     m->items++;

     return 0;

new file mode 100644

@@ -0,0 +1,58 @@

+/* TomsFastMath, a fast ISO C bignum library.

+ * That project is public domain and free for all purposes.

+ * fp_toradix_n included in TomsFastMath specification (tfm.h), but unimplemented until now.

+ * It is based on conversion of mp_toradix_n from libtommath

+ * Will send the body of this function back to the LibTom projects, if they want it

+ */

+#include "bignum_fast.h"

+

+int fp_toradix_n(fp_int *a, char *str, int radix, int maxlen)

+{

+  int     digs;

+  fp_int  t;

+  fp_digit d;

+  char   *_s = str;

+

+  /* check range of the maxlen, radix */

+  if (maxlen < 2 || radix < 2 || radix > 64) {

+    return FP_VAL;

+  }

+

+  /* quick out if its zero */

+  if (fp_iszero(a) == 1) {

+     *str++ = '0';

+     *str = '\0';

+     return FP_OKAY;

+  }

+

+  fp_init_copy(&t, a);

+

+  /* if it is negative output a - */

+  if (t.sign == FP_NEG) {

+    ++_s;

+    *str++ = '-';

+    t.sign = FP_ZPOS;

+    --maxlen;

+  }

+

+  digs = 0;

+  while (fp_iszero (&t) == FP_NO) {

+    if (--maxlen < 1) {

+       /* no more room */

+       break;

+    }

+    fp_div_d (&t, (fp_digit) radix, &t, &d);

+    *str++ = fp_s_rmap[d];

+    ++digs;

+  }

+

+  /* reverse the digits of the string.  In this case _s points

+   * to the first digit [exluding the sign] of the number]

+   */

+  fp_reverse ((unsigned char *)_s, digs);

+

+  /* append a NULL so the string is properly terminated */

+  *str = '\0';

+  return FP_OKAY;

+}

+