@@ -758,28 +758,6 @@ AC_ARG_ENABLE([milter],

 [  --enable-milter	  build clamav-milter],

 have_milter=$enableval, have_milter="no")

-have_system_tommath=no

-AC_ARG_WITH([system-tommath],

-[  --with-system-tommath	link against system libtommath (default = no, use bundled)],

-[

-	case "$withval" in

-	yes)

-		AC_CHECK_LIB([tommath], [mp_mul_2d],

-			[

-				AC_DEFINE([HAVE_SYSTEM_TOMMATH], 1, [link against system-wide libtommath])

-				LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -ltommath"

-				have_system_tommath=yes

-			],

-			[AC_MSG_WARN([****** Option --with-system-tommath was given but libtommath does not seem to be available, using bundled files instead])]

-		)

-	;;

-	no) ;;

-	*) AC_MSG_ERROR([--with-system-tommath does not take an argument]) ;;

-	esac

-])

-AM_CONDITIONAL([LINK_TOMMATH], test "x$have_system_tommath" = "xyes")

-

-

 dnl we need to try to link with iconv, otherwise there could be a 

 dnl mismatch between a 32-bit and 64-bit lib. Detect this at configure time.

 dnl we need to check after zlib/bzip2, because they can change the include path

@@ -341,7 +341,10 @@ libclamav_la_SOURCES = \

 	sha256.h\

 	sha1.c\

 	sha1.h\

+	bignum.c\

 	bignum.h\

+	bignum_fast.h\

+	bignum_superclass.h\

 	bytecode.c\

 	bytecode.h\

 	bytecode_vm.c\

@@ -384,11 +387,6 @@ libclamav_la_SOURCES = \

 	asn1.c \

 	asn1.h

-if !LINK_TOMMATH

-libclamav_la_SOURCES += bignum.c \

-		     bignum_class.h

-endif

-

 .PHONY: version.h.tmp

 version.c: version.h

 version.h: version.h.tmp

@@ -413,7 +411,7 @@ version.h.tmp:

 lib_LTLIBRARIES += libclamav.la

 noinst_LTLIBRARIES = libclamav_internal_utils.la libclamav_internal_utils_nothreads.la libclamav_nocxx.la

-EXTRA_DIST += regex/engine.c libclamav.map \

+EXTRA_DIST += regex/engine.c fp_sqr_comba.c fp_mul_comba.c libclamav.map \

 	     jsparse/generated/operators.h jsparse/generated/keywords.h jsparse/future_reserved_words.list\

 	     jsparse/keywords.list jsparse/special_keywords.list jsparse/operators.gperf

 COMMON_CLEANFILES=version.h version.h.tmp *.gcda *.gcno

@@ -63,9 +63,6 @@ target_triplet = @target@

 @ENABLE_UNRAR_TRUE@	@top_srcdir@/libclamunrar_iface/libclamunrar_iface.map

 @ENABLE_UNRAR_TRUE@@VERSIONSCRIPT_TRUE@am__append_5 = -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamunrar_iface/libclamunrar_iface.map

 @VERSIONSCRIPT_TRUE@am__append_6 = -Wl,@VERSIONSCRIPTFLAG@,@top_srcdir@/libclamav/libclamav.map

-@LINK_TOMMATH_FALSE@am__append_7 = bignum.c \

-@LINK_TOMMATH_FALSE@		     bignum_class.h

-

 subdir = libclamav

 DIST_COMMON = $(include_HEADERS) $(srcdir)/Makefile.am \

 	$(srcdir)/Makefile.in

@@ -113,53 +110,6 @@ LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)

 @ENABLE_UNRAR_TRUE@am__DEPENDENCIES_1 = libclamunrar_iface.la

 @ENABLE_LLVM_FALSE@am__DEPENDENCIES_2 = libclamav_nocxx.la

 @ENABLE_LLVM_TRUE@am__DEPENDENCIES_2 = c++/libclamavcxx.la

-am__libclamav_la_SOURCES_DIST = clamav.h matcher-ac.c matcher-ac.h \

-	matcher-bm.c matcher-bm.h matcher-hash.c matcher-hash.h \

-	matcher.c matcher.h others.c others.h readdb.c readdb.h cvd.c \

-	cvd.h dsig.c dsig.h scanners.c scanners.h textdet.c textdet.h \

-	filetypes.c filetypes.h filetypes_int.h rtf.c rtf.h blob.c \

-	blob.h mbox.c mbox.h message.c message.h table.c table.h \

-	text.c text.h ole2_extract.c ole2_extract.h vba_extract.c \

-	vba_extract.h cltypes.h msexpand.c msexpand.h pe.c pe.h \

-	pe_icons.c pe_icons.h disasm.c disasm.h disasm-common.h \

-	disasmpriv.h upx.c upx.h htmlnorm.c htmlnorm.h chmunpack.c \

-	chmunpack.h rebuildpe.c rebuildpe.h petite.c petite.h \

-	wwunpack.c wwunpack.h unsp.c unsp.h aspack.c aspack.h \

-	packlibs.c packlibs.h fsg.c fsg.h mew.c mew.h upack.c upack.h \

-	line.c line.h untar.c untar.h unzip.c unzip.h inflate64.c \

-	inflate64.h inffixed64.h inflate64_priv.h special.c special.h \

-	binhex.c binhex.h is_tar.c is_tar.h tnef.c tnef.h autoit.c \

-	autoit.h unarj.c unarj.h nsis/bzlib.c nsis/bzlib_private.h \

-	nsis/nsis_bzlib.h nsis/nulsft.c nsis/nulsft.h nsis/infblock.c \

-	nsis/nsis_zconf.h nsis/nsis_zlib.h nsis/nsis_zutil.h pdf.c \

-	pdf.h spin.c spin.h yc.c yc.h elf.c elf.h execs.h sis.c sis.h \

-	uuencode.c uuencode.h phishcheck.c phishcheck.h \

-	phish_domaincheck_db.c phish_domaincheck_db.h \

-	phish_whitelist.c phish_whitelist.h iana_cctld.h iana_tld.h \

-	regex_list.c regex_list.h regex_suffix.c regex_suffix.h \

-	mspack.c mspack.h cab.c cab.h entconv.c entconv.h entitylist.h \

-	encoding_aliases.h hashtab.c hashtab.h dconf.c dconf.h \

-	lzma_iface.c lzma_iface.h 7z_iface.c 7z_iface.h 7z/7z.h \

-	7z/7zAlloc.c 7z/7zAlloc.h 7z/7zBuf.c 7z/7zBuf.h 7z/7zBuf2.c \

-	7z/7zCrc.c 7z/7zCrc.h 7z/7zDec.c 7z/7zFile.c 7z/7zFile.h \

-	7z/7zIn.c 7z/7zStream.c 7z/7zVersion.h 7z/Bcj2.c 7z/Bcj2.h \

-	7z/Bra.c 7z/Bra.h 7z/Bra86.c 7z/CpuArch.h 7z/Lzma2Dec.c \

-	7z/Lzma2Dec.h 7z/LzmaDec.c 7z/LzmaDec.h 7z/Ppmd.h 7z/Ppmd7.c \

-	7z/Ppmd7.h 7z/Ppmd7Dec.c 7z/Types.h explode.c explode.h \

-	textnorm.c textnorm.h dlp.c dlp.h jsparse/js-norm.c \

-	jsparse/js-norm.h jsparse/lexglobal.h jsparse/textbuf.h uniq.c \

-	uniq.h version.c version.h mpool.c mpool.h filtering.h \

-	filtering.c fmap.c fmap.h perflogging.c perflogging.h \

-	default.h sha256.c sha256.h sha1.c sha1.h bignum.h bytecode.c \

-	bytecode.h bytecode_vm.c bytecode_priv.h clambc.h cpio.c \

-	cpio.h macho.c macho.h ishield.c ishield.h type_desc.h \

-	bcfeatures.h bytecode_api.c bytecode_api_decl.c bytecode_api.h \

-	bytecode_api_impl.h bytecode_hooks.h cache.c cache.h \

-	bytecode_detect.c bytecode_detect.h builtin_bytecodes.h \

-	events.c events.h swf.c swf.h jpeg.c jpeg.h png.c png.h \

-	iso9660.c iso9660.h arc4.c arc4.h rijndael.c rijndael.h \

-	crtmgr.c crtmgr.h asn1.c asn1.h bignum.c bignum_class.h

-@LINK_TOMMATH_FALSE@am__objects_1 = libclamav_la-bignum.lo

 am_libclamav_la_OBJECTS = libclamav_la-matcher-ac.lo \

 	libclamav_la-matcher-bm.lo libclamav_la-matcher-hash.lo \

 	libclamav_la-matcher.lo libclamav_la-others.lo \

@@ -206,15 +156,16 @@ am_libclamav_la_OBJECTS = libclamav_la-matcher-ac.lo \

 	libclamav_la-mpool.lo libclamav_la-filtering.lo \

 	libclamav_la-fmap.lo libclamav_la-perflogging.lo \

 	libclamav_la-sha256.lo libclamav_la-sha1.lo \

-	libclamav_la-bytecode.lo libclamav_la-bytecode_vm.lo \

-	libclamav_la-cpio.lo libclamav_la-macho.lo \

-	libclamav_la-ishield.lo libclamav_la-bytecode_api.lo \

-	libclamav_la-bytecode_api_decl.lo libclamav_la-cache.lo \

-	libclamav_la-bytecode_detect.lo libclamav_la-events.lo \

-	libclamav_la-swf.lo libclamav_la-jpeg.lo libclamav_la-png.lo \

+	libclamav_la-bignum.lo libclamav_la-bytecode.lo \

+	libclamav_la-bytecode_vm.lo libclamav_la-cpio.lo \

+	libclamav_la-macho.lo libclamav_la-ishield.lo \

+	libclamav_la-bytecode_api.lo libclamav_la-bytecode_api_decl.lo \

+	libclamav_la-cache.lo libclamav_la-bytecode_detect.lo \

+	libclamav_la-events.lo libclamav_la-swf.lo \

+	libclamav_la-jpeg.lo libclamav_la-png.lo \

 	libclamav_la-iso9660.lo libclamav_la-arc4.lo \

 	libclamav_la-rijndael.lo libclamav_la-crtmgr.lo \

-	libclamav_la-asn1.lo $(am__objects_1)

+	libclamav_la-asn1.lo

 libclamav_la_OBJECTS = $(am_libclamav_la_OBJECTS)

 AM_V_lt = $(am__v_lt_$(V))

 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))

@@ -322,7 +273,7 @@ SOURCES = $(libclamav_la_SOURCES) \

 	$(libclamav_internal_utils_nothreads_la_SOURCES) \

 	$(libclamav_nocxx_la_SOURCES) $(libclamunrar_la_SOURCES) \

 	$(libclamunrar_iface_la_SOURCES)

-DIST_SOURCES = $(am__libclamav_la_SOURCES_DIST) \

+DIST_SOURCES = $(libclamav_la_SOURCES) \

 	$(libclamav_internal_utils_la_SOURCES) \

 	$(libclamav_internal_utils_nothreads_la_SOURCES) \

 	$(libclamav_nocxx_la_SOURCES) \

@@ -540,8 +491,8 @@ AM_CPPFLAGS = -I$(top_srcdir) -I@srcdir@/nsis $(LTDLINCL) \

 AM_CFLAGS = @WERR_CFLAGS@

 lib_LTLIBRARIES = $(am__append_3) libclamav.la

 EXTRA_DIST = c++/Makefile.nollvm.in $(am__append_4) regex/engine.c \

-	libclamav.map jsparse/generated/operators.h \

-	jsparse/generated/keywords.h \

+	fp_sqr_comba.c fp_mul_comba.c libclamav.map \

+	jsparse/generated/operators.h jsparse/generated/keywords.h \

 	jsparse/future_reserved_words.list jsparse/keywords.list \

 	jsparse/special_keywords.list jsparse/operators.gperf

 @ENABLE_UNRAR_TRUE@libclamunrar_la_LDFLAGS = @TH_SAFE@ -version-info \

@@ -628,52 +579,256 @@ libclamav_la_CFLAGS = $(AM_CFLAGS) -DSEARCH_LIBDIR=\"$(libdir)\"

 libclamav_la_LDFLAGS = @TH_SAFE@ -version-info @LIBCLAMAV_VERSION@ \

 	-no-undefined $(am__append_6)

 include_HEADERS = clamav.h

-libclamav_la_SOURCES = clamav.h matcher-ac.c matcher-ac.h matcher-bm.c \

-	matcher-bm.h matcher-hash.c matcher-hash.h matcher.c matcher.h \

-	others.c others.h readdb.c readdb.h cvd.c cvd.h dsig.c dsig.h \

-	scanners.c scanners.h textdet.c textdet.h filetypes.c \

-	filetypes.h filetypes_int.h rtf.c rtf.h blob.c blob.h mbox.c \

-	mbox.h message.c message.h table.c table.h text.c text.h \

-	ole2_extract.c ole2_extract.h vba_extract.c vba_extract.h \

-	cltypes.h msexpand.c msexpand.h pe.c pe.h pe_icons.c \

-	pe_icons.h disasm.c disasm.h disasm-common.h disasmpriv.h \

-	upx.c upx.h htmlnorm.c htmlnorm.h chmunpack.c chmunpack.h \

-	rebuildpe.c rebuildpe.h petite.c petite.h wwunpack.c \

-	wwunpack.h unsp.c unsp.h aspack.c aspack.h packlibs.c \

-	packlibs.h fsg.c fsg.h mew.c mew.h upack.c upack.h line.c \

-	line.h untar.c untar.h unzip.c unzip.h inflate64.c inflate64.h \

-	inffixed64.h inflate64_priv.h special.c special.h binhex.c \

-	binhex.h is_tar.c is_tar.h tnef.c tnef.h autoit.c autoit.h \

-	unarj.c unarj.h nsis/bzlib.c nsis/bzlib_private.h \

-	nsis/nsis_bzlib.h nsis/nulsft.c nsis/nulsft.h nsis/infblock.c \

-	nsis/nsis_zconf.h nsis/nsis_zlib.h nsis/nsis_zutil.h pdf.c \

-	pdf.h spin.c spin.h yc.c yc.h elf.c elf.h execs.h sis.c sis.h \

-	uuencode.c uuencode.h phishcheck.c phishcheck.h \

-	phish_domaincheck_db.c phish_domaincheck_db.h \

-	phish_whitelist.c phish_whitelist.h iana_cctld.h iana_tld.h \

-	regex_list.c regex_list.h regex_suffix.c regex_suffix.h \

-	mspack.c mspack.h cab.c cab.h entconv.c entconv.h entitylist.h \

-	encoding_aliases.h hashtab.c hashtab.h dconf.c dconf.h \

-	lzma_iface.c lzma_iface.h 7z_iface.c 7z_iface.h 7z/7z.h \

-	7z/7zAlloc.c 7z/7zAlloc.h 7z/7zBuf.c 7z/7zBuf.h 7z/7zBuf2.c \

-	7z/7zCrc.c 7z/7zCrc.h 7z/7zDec.c 7z/7zFile.c 7z/7zFile.h \

-	7z/7zIn.c 7z/7zStream.c 7z/7zVersion.h 7z/Bcj2.c 7z/Bcj2.h \

-	7z/Bra.c 7z/Bra.h 7z/Bra86.c 7z/CpuArch.h 7z/Lzma2Dec.c \

-	7z/Lzma2Dec.h 7z/LzmaDec.c 7z/LzmaDec.h 7z/Ppmd.h 7z/Ppmd7.c \

-	7z/Ppmd7.h 7z/Ppmd7Dec.c 7z/Types.h explode.c explode.h \

-	textnorm.c textnorm.h dlp.c dlp.h jsparse/js-norm.c \

-	jsparse/js-norm.h jsparse/lexglobal.h jsparse/textbuf.h uniq.c \

-	uniq.h version.c version.h mpool.c mpool.h filtering.h \

-	filtering.c fmap.c fmap.h perflogging.c perflogging.h \

-	default.h sha256.c sha256.h sha1.c sha1.h bignum.h bytecode.c \

-	bytecode.h bytecode_vm.c bytecode_priv.h clambc.h cpio.c \

-	cpio.h macho.c macho.h ishield.c ishield.h type_desc.h \

-	bcfeatures.h bytecode_api.c bytecode_api_decl.c bytecode_api.h \

-	bytecode_api_impl.h bytecode_hooks.h cache.c cache.h \

-	bytecode_detect.c bytecode_detect.h builtin_bytecodes.h \

-	events.c events.h swf.c swf.h jpeg.c jpeg.h png.c png.h \

-	iso9660.c iso9660.h arc4.c arc4.h rijndael.c rijndael.h \

-	crtmgr.c crtmgr.h asn1.c asn1.h $(am__append_7)

+libclamav_la_SOURCES = \

+	clamav.h \

+        matcher-ac.c \

+        matcher-ac.h \

+        matcher-bm.c \

+        matcher-bm.h \

+        matcher-hash.c \

+        matcher-hash.h \

+        matcher.c \

+        matcher.h \

+        others.c \

+        others.h \

+        readdb.c \

+	readdb.h \

+	cvd.c \

+	cvd.h \

+	dsig.c \

+	dsig.h \

+	scanners.c \

+	scanners.h \

+	textdet.c \

+	textdet.h \

+	filetypes.c \

+	filetypes.h \

+	filetypes_int.h \

+	rtf.c \

+	rtf.h \

+	blob.c \

+	blob.h \

+	mbox.c \

+	mbox.h \

+	message.c \

+	message.h \

+	table.c \

+	table.h \

+	text.c \

+	text.h \

+	ole2_extract.c \

+	ole2_extract.h \

+	vba_extract.c \

+	vba_extract.h \

+	cltypes.h \

+	msexpand.c \

+	msexpand.h \

+	pe.c \

+	pe.h \

+	pe_icons.c \

+	pe_icons.h \

+	disasm.c \

+	disasm.h \

+	disasm-common.h \

+	disasmpriv.h \

+	upx.c \

+	upx.h \

+	htmlnorm.c \

+	htmlnorm.h \

+	chmunpack.c \

+	chmunpack.h \

+	rebuildpe.c \

+	rebuildpe.h \

+	petite.c \

+	petite.h \

+	wwunpack.c \

+	wwunpack.h \

+	unsp.c \

+	unsp.h \

+	aspack.c \

+	aspack.h \

+	packlibs.c \

+	packlibs.h \

+	fsg.c \

+	fsg.h \

+	mew.c \

+	mew.h \

+	upack.c \

+	upack.h \

+	line.c \

+	line.h \

+	untar.c \

+	untar.h \

+	unzip.c \

+	unzip.h \

+	inflate64.c \

+	inflate64.h \

+	inffixed64.h \

+	inflate64_priv.h \

+	special.c \

+	special.h \

+	binhex.c \

+	binhex.h \

+	is_tar.c \

+	is_tar.h \

+	tnef.c \

+	tnef.h \

+	autoit.c \

+	autoit.h \

+	unarj.c \

+	unarj.h \

+	nsis/bzlib.c \

+	nsis/bzlib_private.h \

+	nsis/nsis_bzlib.h \

+	nsis/nulsft.c \

+	nsis/nulsft.h \

+	nsis/infblock.c \

+	nsis/nsis_zconf.h \

+	nsis/nsis_zlib.h \

+	nsis/nsis_zutil.h \

+	pdf.c \

+	pdf.h \

+	spin.c \

+	spin.h \

+	yc.c \

+	yc.h \

+	elf.c \

+	elf.h \

+	execs.h \

+	sis.c \

+	sis.h \

+	uuencode.c \

+	uuencode.h \

+	phishcheck.c \

+	phishcheck.h \

+	phish_domaincheck_db.c \

+	phish_domaincheck_db.h \

+	phish_whitelist.c \

+	phish_whitelist.h \

+	iana_cctld.h \

+	iana_tld.h \

+	regex_list.c \

+	regex_list.h \

+	regex_suffix.c \

+	regex_suffix.h \

+	mspack.c \

+	mspack.h \

+	cab.c \

+	cab.h \

+	entconv.c \

+	entconv.h \

+	entitylist.h \

+	encoding_aliases.h \

+	hashtab.c \

+	hashtab.h \

+	dconf.c \

+	dconf.h \

+	lzma_iface.c \

+	lzma_iface.h \

+	7z_iface.c \

+	7z_iface.h \

+	7z/7z.h \

+	7z/7zAlloc.c \

+	7z/7zAlloc.h \

+	7z/7zBuf.c \

+	7z/7zBuf.h \

+	7z/7zBuf2.c \

+	7z/7zCrc.c \

+	7z/7zCrc.h \

+	7z/7zDec.c \

+	7z/7zFile.c \

+	7z/7zFile.h \

+	7z/7zIn.c \

+	7z/7zStream.c \

+	7z/7zVersion.h \

+	7z/Bcj2.c \

+	7z/Bcj2.h \

+	7z/Bra.c \

+	7z/Bra.h \

+	7z/Bra86.c \

+	7z/CpuArch.h \

+	7z/Lzma2Dec.c \

+	7z/Lzma2Dec.h \

+	7z/LzmaDec.c \

+	7z/LzmaDec.h \

+	7z/Ppmd.h \

+	7z/Ppmd7.c \

+	7z/Ppmd7.h \

+	7z/Ppmd7Dec.c \

+	7z/Types.h \

+	explode.c \

+	explode.h \

+	textnorm.c \

+	textnorm.h \

+	dlp.c \

+	dlp.h \

+	jsparse/js-norm.c \

+	jsparse/js-norm.h \

+	jsparse/lexglobal.h \

+	jsparse/textbuf.h \

+	uniq.c \

+	uniq.h \

+	version.c\

+	version.h\

+	mpool.c\

+	mpool.h \

+	filtering.h\

+	filtering.c\

+	fmap.c \

+	fmap.h \

+	perflogging.c\

+	perflogging.h\

+	default.h\

+	sha256.c\

+	sha256.h\

+	sha1.c\

+	sha1.h\

+	bignum.c\

+	bignum.h\

+	bignum_fast.h\

+	bignum_superclass.h\

+	bytecode.c\

+	bytecode.h\

+	bytecode_vm.c\

+	bytecode_priv.h\

+	clambc.h \

+	cpio.c \

+	cpio.h \

+	macho.c \

+	macho.h \

+	ishield.c \

+	ishield.h \

+	type_desc.h \

+	bcfeatures.h \

+	bytecode_api.c \

+	bytecode_api_decl.c \

+	bytecode_api.h \

+	bytecode_api_impl.h \

+	bytecode_hooks.h \

+	cache.c \

+	cache.h \

+	bytecode_detect.c \

+	bytecode_detect.h\

+	builtin_bytecodes.h\

+	events.c\

+	events.h \

+	swf.c \

+	swf.h \

+	jpeg.c \

+	jpeg.h \

+	png.c \

+	png.h \

+	iso9660.c \

+	iso9660.h \

+	arc4.c \

+	arc4.h \

+	rijndael.c \

+	rijndael.h \

+	crtmgr.c \

+	crtmgr.h \

+	asn1.c \

+	asn1.h

+

 noinst_LTLIBRARIES = libclamav_internal_utils.la libclamav_internal_utils_nothreads.la libclamav_nocxx.la

 COMMON_CLEANFILES = version.h version.h.tmp *.gcda *.gcno

 @MAINTAINER_MODE_TRUE@BUILT_SOURCES = jsparse/generated/operators.h jsparse/generated/keywords.h jsparse-keywords.gperf

@@ -1683,6 +1838,14 @@ libclamav_la-sha1.lo: sha1.c

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

 @am__fastdepCC_FALSE@	$(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-sha1.lo `test -f 'sha1.c' || echo '$(srcdir)/'`sha1.c

+libclamav_la-bignum.lo: bignum.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-bignum.lo -MD -MP -MF $(DEPDIR)/libclamav_la-bignum.Tpo -c -o libclamav_la-bignum.lo `test -f 'bignum.c' || echo '$(srcdir)/'`bignum.c

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

+@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@

+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bignum.c' object='libclamav_la-bignum.lo' libtool=yes @AMDEPBACKSLASH@

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

+@am__fastdepCC_FALSE@	$(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-bignum.lo `test -f 'bignum.c' || echo '$(srcdir)/'`bignum.c

+

 libclamav_la-bytecode.lo: bytecode.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-bytecode.lo -MD -MP -MF $(DEPDIR)/libclamav_la-bytecode.Tpo -c -o libclamav_la-bytecode.lo `test -f 'bytecode.c' || echo '$(srcdir)/'`bytecode.c

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

@@ -1827,14 +1990,6 @@ libclamav_la-asn1.lo: asn1.c

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

 @am__fastdepCC_FALSE@	$(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-asn1.lo `test -f 'asn1.c' || echo '$(srcdir)/'`asn1.c

-libclamav_la-bignum.lo: bignum.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-bignum.lo -MD -MP -MF $(DEPDIR)/libclamav_la-bignum.Tpo -c -o libclamav_la-bignum.lo `test -f 'bignum.c' || echo '$(srcdir)/'`bignum.c

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

-@am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@

-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='bignum.c' object='libclamav_la-bignum.lo' libtool=yes @AMDEPBACKSLASH@

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

-@am__fastdepCC_FALSE@	$(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-bignum.lo `test -f 'bignum.c' || echo '$(srcdir)/'`bignum.c

-

 libclamav_internal_utils_la-str.lo: str.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_internal_utils_la_CFLAGS) $(CFLAGS) -MT libclamav_internal_utils_la-str.lo -MD -MP -MF $(DEPDIR)/libclamav_internal_utils_la-str.Tpo -c -o libclamav_internal_utils_la-str.lo `test -f 'str.c' || echo '$(srcdir)/'`str.c

 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libclamav_internal_utils_la-str.Tpo $(DEPDIR)/libclamav_internal_utils_la-str.Plo

@@ -1,840 +1,61 @@

-/* LibTomMath, multiple-precision integer library -- Tom St Denis

- *

- * LibTomMath is a library that provides multiple-precision

- * integer arithmetic as well as number theoretic functionality.

- *

- * The library was designed directly after the MPI library by

- * Michael Fromberger but has been written from scratch with

- * additional optimizations in place.

- *

- * The library is free for all purposes without any express

- * guarantee it works.

- *

- * Tom St Denis, tomstdenis@gmail.com, http://math.libtomcrypt.com

- */

-

-#if HAVE_CONFIG_H

-#include "clamav-config.h"

-#endif

-

-/* Start: bn_error.c */

-#include <bignum.h>

-#include "others.h"

-

-#ifdef BN_ERROR_C

-static const struct {

-     int code;

-     const char *msg;

-} msgs[] = {

-     { MP_OKAY, "Successful" },

-     { MP_MEM,  "Out of heap" },

-     { MP_VAL,  "Value out of range" }

-};

-

-/* return a char * string for a given code */

-const char *mp_error_to_string(int code)

-{

-   int x;

-

-   /* scan the lookup table for the given message */

-   for (x = 0; x < (int)(sizeof(msgs) / sizeof(msgs[0])); x++) {

-       if (msgs[x].code == code) {

-          return msgs[x].msg;

-       }

-   }

-

-   /* generic reply for invalid code */

-   return "Invalid error code";

-}

-

-#endif

-

-/* $Source: /cvs/libtom/libtommath/bn_error.c,v $ */

-/* $Revision: 1.3 $ */

-/* $Date: 2006/03/31 14:18:44 $ */

-

-/* End: bn_error.c */

-

-/* Start: bn_fast_mp_invmod.c */

-#include <bignum.h>

-#ifdef BN_FAST_MP_INVMOD_C

-/* LibTomMath, multiple-precision integer library -- Tom St Denis

- *

- * LibTomMath is a library that provides multiple-precision

- * integer arithmetic as well as number theoretic functionality.

- *

- * The library was designed directly after the MPI library by

- * Michael Fromberger but has been written from scratch with

- * additional optimizations in place.

- *

- * The library is free for all purposes without any express

- * guarantee it works.

- *

- * Tom St Denis, tomstdenis@gmail.com, http://math.libtomcrypt.com

- */

-

-/* computes the modular inverse via binary extended euclidean algorithm, 

- * that is c = 1/a mod b 

- *

- * Based on slow invmod except this is optimized for the case where b is 

- * odd as per HAC Note 14.64 on pp. 610

- */

-int fast_mp_invmod (mp_int * a, mp_int * b, mp_int * c)

-{

-  mp_int  x, y, u, v, B, D;

-  int     res, neg;

-

-  /* 2. [modified] b must be odd   */

-  if (mp_iseven (b) == 1) {

-    return MP_VAL;

-  }

-

-  /* init all our temps */

-  if ((res = mp_init_multi(&x, &y, &u, &v, &B, &D, NULL)) != MP_OKAY) {

-     return res;

-  }

-

-  /* x == modulus, y == value to invert */

-  if ((res = mp_copy (b, &x)) != MP_OKAY) {

-    goto LBL_ERR;

-  }

-

-  /* we need y = |a| */

-  if ((res = mp_mod (a, b, &y)) != MP_OKAY) {

-    goto LBL_ERR;

-  }

-

-  /* 3. u=x, v=y, A=1, B=0, C=0,D=1 */

-  if ((res = mp_copy (&x, &u)) != MP_OKAY) {

-    goto LBL_ERR;

-  }

-  if ((res = mp_copy (&y, &v)) != MP_OKAY) {

-    goto LBL_ERR;

-  }

-  mp_set (&D, 1);

-

-top:

-  /* 4.  while u is even do */

-  while (mp_iseven (&u) == 1) {

-    /* 4.1 u = u/2 */

-    if ((res = mp_div_2 (&u, &u)) != MP_OKAY) {

-      goto LBL_ERR;

-    }

-    /* 4.2 if B is odd then */

-    if (mp_isodd (&B) == 1) {

-      if ((res = mp_sub (&B, &x, &B)) != MP_OKAY) {

-        goto LBL_ERR;

-      }

-    }

-    /* B = B/2 */

-    if ((res = mp_div_2 (&B, &B)) != MP_OKAY) {

-      goto LBL_ERR;

-    }

-  }

-

-  /* 5.  while v is even do */

-  while (mp_iseven (&v) == 1) {

-    /* 5.1 v = v/2 */

-    if ((res = mp_div_2 (&v, &v)) != MP_OKAY) {

-      goto LBL_ERR;

-    }

-    /* 5.2 if D is odd then */

-    if (mp_isodd (&D) == 1) {

-      /* D = (D-x)/2 */

-      if ((res = mp_sub (&D, &x, &D)) != MP_OKAY) {

-        goto LBL_ERR;

-      }

-    }

-    /* D = D/2 */

-    if ((res = mp_div_2 (&D, &D)) != MP_OKAY) {

-      goto LBL_ERR;

-    }

-  }

-

-  /* 6.  if u >= v then */

-  if (mp_cmp (&u, &v) != MP_LT) {

-    /* u = u - v, B = B - D */

-    if ((res = mp_sub (&u, &v, &u)) != MP_OKAY) {

-      goto LBL_ERR;

-    }

-

-    if ((res = mp_sub (&B, &D, &B)) != MP_OKAY) {

-      goto LBL_ERR;

-    }

-  } else {

-    /* v - v - u, D = D - B */

-    if ((res = mp_sub (&v, &u, &v)) != MP_OKAY) {

-      goto LBL_ERR;

-    }

-

-    if ((res = mp_sub (&D, &B, &D)) != MP_OKAY) {

-      goto LBL_ERR;

-    }

-  }

-

-  /* if not zero goto step 4 */

-  if (mp_iszero (&u) == 0) {

-    goto top;

-  }

-

-  /* now a = C, b = D, gcd == g*v */

-

-  /* if v != 1 then there is no inverse */

-  if (mp_cmp_d (&v, 1) != MP_EQ) {

-    res = MP_VAL;

-    goto LBL_ERR;

-  }

-

-  /* b is now the inverse */

-  neg = a->sign;

-  while (D.sign == MP_NEG) {

-    if ((res = mp_add (&D, b, &D)) != MP_OKAY) {

-      goto LBL_ERR;

-    }

-  }

-  mp_exch (&D, c);

-  c->sign = neg;

-  res = MP_OKAY;

-

-LBL_ERR:mp_clear_multi (&x, &y, &u, &v, &B, &D, NULL);

-  return res;

-}

-#endif

-

-/* $Source: /cvs/libtom/libtommath/bn_fast_mp_invmod.c,v $ */

-/* $Revision: 1.3 $ */

-/* $Date: 2006/03/31 14:18:44 $ */

-

-/* End: bn_fast_mp_invmod.c */

-

-/* Start: bn_fast_mp_montgomery_reduce.c */

-#include <bignum.h>

-#ifdef BN_FAST_MP_MONTGOMERY_REDUCE_C

-/* LibTomMath, multiple-precision integer library -- Tom St Denis

- *

- * LibTomMath is a library that provides multiple-precision

- * integer arithmetic as well as number theoretic functionality.

- *

- * The library was designed directly after the MPI library by

- * Michael Fromberger but has been written from scratch with

- * additional optimizations in place.

- *

- * The library is free for all purposes without any express

- * guarantee it works.

- *

- * Tom St Denis, tomstdenis@gmail.com, http://math.libtomcrypt.com

- */

-

-/* computes xR**-1 == x (mod N) via Montgomery Reduction

- *

- * This is an optimized implementation of montgomery_reduce

- * which uses the comba method to quickly calculate the columns of the

- * reduction.

- *

- * Based on Algorithm 14.32 on pp.601 of HAC.

-*/

-int fast_mp_montgomery_reduce (mp_int * x, mp_int * n, mp_digit rho)

-{

-  int     ix, res, olduse;

-  mp_word W[MP_WARRAY];

-

-  /* get old used count */

-  olduse = x->used;

-

-  /* grow a as required */

-  if (x->alloc < n->used + 1) {

-    if ((res = mp_grow (x, n->used + 1)) != MP_OKAY) {

-      return res;

-    }

-  }

-

-  /* first we have to get the digits of the input into

-   * an array of double precision words W[...]

-   */

-  {

-    register mp_word *_W;

-    register mp_digit *tmpx;

-

-    /* alias for the W[] array */

-    _W   = W;

-

-    /* alias for the digits of  x*/

-    tmpx = x->dp;

-

-    /* copy the digits of a into W[0..a->used-1] */

-    for (ix = 0; ix < x->used; ix++) {

-      *_W++ = *tmpx++;

-    }

-

-    /* zero the high words of W[a->used..m->used*2] */

-    for (; ix < n->used * 2 + 1; ix++) {

-      *_W++ = 0;

-    }

-  }

-

-  /* now we proceed to zero successive digits

-   * from the least significant upwards

-   */

-  for (ix = 0; ix < n->used; ix++) {

-    /* mu = ai * m' mod b

-     *

-     * We avoid a double precision multiplication (which isn't required)

-     * by casting the value down to a mp_digit.  Note this requires

-     * that W[ix-1] have  the carry cleared (see after the inner loop)

-     */

-    register mp_digit mu;

-    mu = (mp_digit) (((W[ix] & MP_MASK) * rho) & MP_MASK);

-

-    /* a = a + mu * m * b**i

-     *

-     * This is computed in place and on the fly.  The multiplication

-     * by b**i is handled by offseting which columns the results

-     * are added to.

-     *

-     * Note the comba method normally doesn't handle carries in the

-     * inner loop In this case we fix the carry from the previous

-     * column since the Montgomery reduction requires digits of the

-     * result (so far) [see above] to work.  This is

-     * handled by fixing up one carry after the inner loop.  The

-     * carry fixups are done in order so after these loops the

-     * first m->used words of W[] have the carries fixed

-     */

-    {

-      register int iy;

-      register mp_digit *tmpn;

-      register mp_word *_W;

-

-      /* alias for the digits of the modulus */

-      tmpn = n->dp;

-

-      /* Alias for the columns set by an offset of ix */

-      _W = W + ix;

-

-      /* inner loop */

-      for (iy = 0; iy < n->used; iy++) {

-          *_W++ += ((mp_word)mu) * ((mp_word)*tmpn++);

-      }

-    }

-

-    /* now fix carry for next digit, W[ix+1] */

-    W[ix + 1] += W[ix] >> ((mp_word) DIGIT_BIT);

-  }

-

-  /* now we have to propagate the carries and

-   * shift the words downward [all those least

-   * significant digits we zeroed].

-   */

-  {

-    register mp_digit *tmpx;

-    register mp_word *_W, *_W1;

-

-    /* nox fix rest of carries */

-

-    /* alias for current word */

-    _W1 = W + ix;

-

-    /* alias for next word, where the carry goes */

-    _W = W + ++ix;

-

-    for (; ix <= n->used * 2 + 1; ix++) {

-      *_W++ += *_W1++ >> ((mp_word) DIGIT_BIT);

-    }

-

-    /* copy out, A = A/b**n

-     *

-     * The result is A/b**n but instead of converting from an

-     * array of mp_word to mp_digit than calling mp_rshd

-     * we just copy them in the right order

-     */

-

-    /* alias for destination word */

-    tmpx = x->dp;

-

-    /* alias for shifted double precision result */

-    _W = W + n->used;

-

-    for (ix = 0; ix < n->used + 1; ix++) {

-      *tmpx++ = (mp_digit)(*_W++ & ((mp_word) MP_MASK));

-    }

-

-    /* zero oldused digits, if the input a was larger than

-     * m->used+1 we'll have to clear the digits

-     */

-    for (; ix < olduse; ix++) {

-      *tmpx++ = 0;

-    }

-  }

-

-  /* set the max used and clamp */

-  x->used = n->used + 1;

-  mp_clamp (x);

-

-  /* if A >= m then A = A - m */

-  if (mp_cmp_mag (x, n) != MP_LT) {

-    return s_mp_sub (x, n, x);

-  }

-  return MP_OKAY;

-}

-#endif