Merge branch 'release/0.13.0'

Author: sjaeckel

.gitignore

@@ -0,0 +1,27 @@
+*.[ao]
+*.aux
+*.dvi
+*.idx
+*.ilg
+*.ind
+*.lof
+*.log
+*.toc
+*.out
+*.l[ao]
+*.orig
+.project
+.cproject
+/.libs
+test_*.txt
+
+test
+test.exe
+mtest
+mtest.exe
+stest
+stest.exe
+rsatest
+rsatest.exe
+timing
+timing.exe

.travis.yml

@@ -0,0 +1,32 @@
+language: c
+compiler:
+  - gcc
+script: CC="${MYCC}" make ${SHARED} test_standalone >test_gcc_1.txt 2>test_gcc_2.txt && ./test >test_std.txt 2>test_err.txt
+env:
+  - MYCC="gcc" SHARED=""
+  - MYCC="gcc -m32" SHARED=""
+  - MYCC="gcc-4.8" SHARED=""
+  - MYCC="gcc-4.8 -m32" SHARED=""
+  - MYCC="gcc-4.9" SHARED=""
+  - MYCC="gcc-4.9 -m32" SHARED=""
+  - MYCC="gcc" SHARED="-f makefile.shared"
+  - MYCC="gcc -m32" SHARED="-f makefile.shared"
+  - MYCC="gcc-4.8" SHARED="-f makefile.shared"
+  - MYCC="gcc-4.8 -m32" SHARED="-f makefile.shared"
+  - MYCC="gcc-4.9" SHARED="-f makefile.shared"
+  - MYCC="gcc-4.9 -m32" SHARED="-f makefile.shared"
+matrix:
+  fast_finish: true
+before_script:
+  - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+  - sudo apt-get -qq update
+  - sudo apt-get install gcc-4.9-multilib gcc-4.8-multilib gcc-multilib build-essential
+after_failure:
+  - cat test_gcc_1.txt
+  - cat test_std.txt
+  - cat test_err.txt
+after_script:
+  - cat test_gcc_2.txt
+notifications:
+  irc: "chat.freenode.net#libtom"
+

LICENSE

@@ -1,7 +1,36 @@
-TomsFastMath is public domain.
+TomsFastMath is licensed under DUAL licensing terms.
+
+Choose and use the license of your needs.
+
+[LICENSE #1]
+
+TomsFastMath is public domain.  As should all quality software be.
+
+Tom St Denis
+
+[/LICENSE #1]
+
+[LICENSE #2]
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+                    Version 2, December 2004
+
+ Copyright (C) 2004 Sam Hocevar <[email protected]>
+
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+
+            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. You just DO WHAT THE FUCK YOU WANT TO. 
+
+[/LICENSE #2]
+
+-- Mark Karpel�s & Steffen Jaeckel
 
 Note some ideas were borrowed from LibTomMath and OpenSSL.  All of the code is original or ported
-from LibTomMath [no code was ported from OpenSSL].  As such the origins and status of this code
-are both public domain.
+from LibTomMath [no code was ported from OpenSSL].
 
 -- Tom St Denis

README.md

@@ -0,0 +1,11 @@
+tomsfastmath
+============
+
+See doc/tfm.pdf for a detailed documentation
+
+
+Project Status
+==============
+
+master: [![Build Status](https://travis-ci.org/libtom/tomsfastmath.svg?branch=master)](https://travis-ci.org/libtom/tomsfastmath)
+

changes.txt

@@ -1,3 +1,15 @@
+October 24th, 2015
+v0.13.0
+     -- Add fp_rand()
+     -- Fix bug in fp_sub() reported by Martins Mozeiko
+     -- Fix bugs/apply patches in fp_mul() and fp_sqr() reported by rasky
+     -- Fix bugs in fp_read_radix()
+     -- Fix build issues for Linux x32 ABI
+     -- Sebastian Siewior provided fp_toradix_n(),
+        reported multiple issues on behalf of ClamAV
+        and did most of the testing work to be able to push this release out.
+     -- Fix a load of compiler warnings.
+
 March 14th, 2007
 0.12 -- Christophe Devine contributed MIPS asm w00t
      ++ quick release to get the MIPS code out there

demo/stest.c

@@ -8,8 +8,32 @@
 
 #ifndef DISPLAY
    #define DISPLAY(x) printf(x)
+   #define DISPLAY_P(...) printf(__VA_ARGS__)
+#else
+   #define DISPLAY_P(...) (void)0
+   #define fp_dump(n,p) do{}while(0)
 #endif
 
+#ifndef fp_dump
+void fp_dump(const char* n, fp_int* p)
+{
+  int sz;
+  if (fp_radix_size(p, 2, &sz) != FP_OKAY)
+    return;
+  char* str = malloc(sz);
+  if (!str)
+    return;
+#ifdef STEST_VERBOSE
+  fp_toradix(p, str, 2);
+  DISPLAY_P("%s = 0b%s\n", n, str);
+  fp_toradix(p, str, 16);
+  DISPLAY_P("%s = 0x%s\n", n, str);
+#endif
+  fp_toradix(p, str, 10);
+  DISPLAY_P("%s = %s\n", n, str);
+  free(str);
+}
+#endif
 
 #ifdef GBA_MODE
 int c_main(void)
@@ -33,14 +57,16 @@ int main(void)
    modetxt_gotoxy(0,0);
 #endif
 
+   DISPLAY_P("TFM Ident string:\n%s\n\n", fp_ident());
+
    /* test multiplication */
    fp_read_radix(&a, "3453534534535345345341230891273", 10);
    fp_read_radix(&b, "2394873294871238934718923" , 10);
    fp_read_radix(&c, "8270777629674273015508507050766235312931312159028658979", 10);
    fp_mul(&a, &b, &d);
    if (fp_cmp(&c, &d)) {
       DISPLAY("mul failed\n");
-      return 0;
+      return -1;
    } else {
       DISPLAY("mul passed\n");
    }
@@ -52,7 +78,7 @@ int main(void)
    fp_mul(&a, &b, &d);
    if (fp_cmp(&c, &d)) {
       DISPLAY("mul failed\n");
-      return 0;
+      return -1;
    } else {
       DISPLAY("mul passed\n");
    }
@@ -64,7 +90,7 @@ int main(void)
    fp_mul(&a, &b, &d);
    if (fp_cmp(&c, &d)) {
       DISPLAY("mul failed\n");
-      return 0;
+      return -1;
    } else {
       DISPLAY("mul passed\n");
    }
@@ -75,7 +101,7 @@ int main(void)
    fp_sqr(&a, &c);
    if (fp_cmp(&c, &b)) {
       DISPLAY("sqr failed\n");
-      return 0;
+      return -1;
    } else {
       DISPLAY("sqr passed\n");
    }
@@ -85,7 +111,7 @@ int main(void)
    fp_sqr(&a, &c);
    if (fp_cmp(&c, &b)) {
       DISPLAY("sqr failed\n");
-      return 0;
+      return -1;
    } else {
       DISPLAY("sqr passed\n");
    }
@@ -95,7 +121,7 @@ int main(void)
    fp_sqr(&a, &c);
    if (fp_cmp(&c, &b)) {
       DISPLAY("sqr failed\n");
-      return 0;
+      return -1;
    } else {
       DISPLAY("sqr passed\n");
    }
@@ -104,43 +130,56 @@ int main(void)
    /* montgomery reductions */
    fp_read_radix(&a, "234892374892374893489123428937892781237863278637826327367637836278362783627836783678363", 10);
    fp_read_radix(&b, "4447823492749823749234123489273987393983289319382762756425425425642727352327452374521", 10);
+#ifdef FP_64BIT
+   fp_read_radix(&c, "942974496560863503657226741422301598807235487941674147660989764036913926327577165648", 10);
+#else
    fp_read_radix(&c, "2396271882990732698083317035605836523697277786556053771759862552557086442129695099100", 10);
-   fp_montgomery_setup(&b, &dp);
+#endif
+   if (fp_montgomery_setup(&b, &dp) != FP_OKAY)
+      DISPLAY("mont setup failed\n");
    fp_montgomery_reduce(&a, &b, dp);
    if (fp_cmp(&a, &c)) {
       DISPLAY("mont failed\n");
-      return 0;
+      fp_dump("a (is    )", &a);
+      fp_dump("c (should)", &c);
+      return -1;
    } else {
       DISPLAY("mont passed\n");
    }
 
    fp_read_radix(&a, "2348923748923748934891234456645654645645684576353428937892781237863278637826327367637836278362783627836783678363", 10);
    fp_read_radix(&b, "444782349274982374923412348927398739398328931938276275642542542564272735232745237452123424324324444121111119", 10);
    fp_read_radix(&c, "45642613844554582908652603086180267403823312390990082328515008314514368668691233331246183943400359349283420", 10);
-   fp_montgomery_setup(&b, &dp);
+   if (fp_montgomery_setup(&b, &dp) != FP_OKAY)
+      DISPLAY("mont setup failed\n");
    fp_montgomery_reduce(&a, &b, dp);
    if (fp_cmp(&a, &c)) {
       DISPLAY("mont failed\n");
-      return 0;
+      fp_dump("a (is    )", &a);
+      fp_dump("c (should)", &c);
+      return -1;
    } else {
       DISPLAY("mont passed\n");
    }
 
    fp_read_radix(&a, "234823424242342923748923748934891234456645654645645684576353424972378234762378623891236834132352375235378462378489378927812378632786378263273676378362783627555555555539568389052478124618461834763837685723645827529034853490580134568947341278498542893481762349723907847892983627836783678363", 10);
    fp_read_radix(&b, "44478234927456563455982374923412348927398739398328931938276275642485623481638279025465891276312903262837562349056234783648712314678120389173890128905425242424239784256427", 10);
    fp_read_radix(&c, "33160865265453361650564031464519042126185632333462754084489985719613480783282357410514898819797738034600484519472656152351777186694609218202276509271061460265488348645081", 10);
-   fp_montgomery_setup(&b, &dp);
+   if (fp_montgomery_setup(&b, &dp) != FP_OKAY)
+      DISPLAY("mont setup failed\n");
    fp_montgomery_reduce(&a, &b, dp);
    if (fp_cmp(&a, &c)) {
       DISPLAY("mont failed\n");
-      return 0;
+      fp_dump("a (is    )", &a);
+      fp_dump("c (should)", &c);
+      return -1;
    } else {
       DISPLAY("mont passed\n");
    }
 
 
    return 0;
-}   
+}
 
 
 /* $Source$ */