ibphoenix/tomsfastmath
6
0
Fork 1
Code Issues Pull Requests Packages Releases Wiki Activity

Merge remote-tracking branch 'rasky/bugfix_sqr_bufferoverflow'

Browse Source
This commit is contained in:
Steffen Jaeckel 2014-06-12 11:31:39 +02:00
commit bea9b1cc22
2 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/mul/fp_mul.c
View File

@ -28,92 +28,92 @@ void fp_mul(fp_int *A, fp_int *B, fp_int *C)
if say y=17 then we would do (32-17)^2 = 225 unneeded multiplications if say y=17 then we would do (32-17)^2 = 225 unneeded multiplications
*/ */
#ifdef TFM_MUL3 #ifdef TFM_MUL3 && FP_SIZE >= 6
if (y <= 3) { if (y <= 3) {
fp_mul_comba3(A,B,C); fp_mul_comba3(A,B,C);
return; return;
} }
#endif #endif
#ifdef TFM_MUL4 #ifdef TFM_MUL4 && FP_SIZE >= 8
if (y == 4) { if (y == 4) {
fp_mul_comba4(A,B,C); fp_mul_comba4(A,B,C);
return; return;
} }
#endif #endif
#ifdef TFM_MUL6 #ifdef TFM_MUL6 && FP_SIZE >= 12
if (y <= 6) { if (y <= 6) {
fp_mul_comba6(A,B,C); fp_mul_comba6(A,B,C);
return; return;
} }
#endif #endif
#ifdef TFM_MUL7 #ifdef TFM_MUL7 && FP_SIZE >= 14
if (y == 7) { if (y == 7) {
fp_mul_comba7(A,B,C); fp_mul_comba7(A,B,C);
return; return;
} }
#endif #endif
#ifdef TFM_MUL8 #ifdef TFM_MUL8 && FP_SIZE >= 16
if (y == 8) { if (y == 8) {
fp_mul_comba8(A,B,C); fp_mul_comba8(A,B,C);
return; return;
} }
#endif #endif
#ifdef TFM_MUL9 #ifdef TFM_MUL9 && FP_SIZE >= 18
if (y == 9) { if (y == 9) {
fp_mul_comba9(A,B,C); fp_mul_comba9(A,B,C);
return; return;
} }
#endif #endif
#ifdef TFM_MUL12 #ifdef TFM_MUL12 && FP_SIZE >= 24
if (y <= 12) { if (y <= 12) {
fp_mul_comba12(A,B,C); fp_mul_comba12(A,B,C);
return; return;
} }
#endif #endif
#ifdef TFM_MUL17 #ifdef TFM_MUL17 && FP_SIZE >= 34
if (y <= 17) { if (y <= 17) {
fp_mul_comba17(A,B,C); fp_mul_comba17(A,B,C);
return; return;
} }
#endif #endif
#ifdef TFM_SMALL_SET #ifdef TFM_SMALL_SET && FP_SIZE >= 32
if (y <= 16) { if (y <= 16) {
fp_mul_comba_small(A,B,C); fp_mul_comba_small(A,B,C);
return; return;
} }
#endif #endif
#if defined(TFM_MUL20) #if defined(TFM_MUL20) && FP_SIZE >= 40
if (y <= 20) { if (y <= 20) {
fp_mul_comba20(A,B,C); fp_mul_comba20(A,B,C);
return; return;
} }
#endif #endif
#if defined(TFM_MUL24) #if defined(TFM_MUL24) && FP_SIZE >= 48
if (yy >= 16 && y <= 24) { if (yy >= 16 && y <= 24) {
fp_mul_comba24(A,B,C); fp_mul_comba24(A,B,C);
return; return;
} }
#endif #endif
#if defined(TFM_MUL28) #if defined(TFM_MUL28) && FP_SIZE >= 56
if (yy >= 20 && y <= 28) { if (yy >= 20 && y <= 28) {
fp_mul_comba28(A,B,C); fp_mul_comba28(A,B,C);
return; return;
} }
#endif #endif
#if defined(TFM_MUL32) #if defined(TFM_MUL32) && FP_SIZE >= 64
if (yy >= 24 && y <= 32) { if (yy >= 24 && y <= 32) {
fp_mul_comba32(A,B,C); fp_mul_comba32(A,B,C);
return; return;
} }
#endif #endif
#if defined(TFM_MUL48) #if defined(TFM_MUL48) && FP_SIZE >= 96
if (yy >= 40 && y <= 48) { if (yy >= 40 && y <= 48) {
fp_mul_comba48(A,B,C); fp_mul_comba48(A,B,C);
return; return;
} }
#endif #endif
#if defined(TFM_MUL64) #if defined(TFM_MUL64) && FP_SIZE >= 128
if (yy >= 56 && y <= 64) { if (yy >= 56 && y <= 64) {
fp_mul_comba64(A,B,C); fp_mul_comba64(A,B,C);
return; return;
@ -123,6 +123,6 @@ void fp_mul(fp_int *A, fp_int *B, fp_int *C)
} }
/* $Source$ */ /* $Source: /cvs/libtom/tomsfastmath/src/mul/fp_mul.c,v $ */
/* $Revision$ */ /* $Revision: 1.1 $ */
/* $Date$ */ /* $Date: 2006/12/31 21:25:53 $ */

34
src/sqr/fp_sqr.c
View File

@ -21,49 +21,49 @@ void fp_sqr(fp_int *A, fp_int *B)
} }
y = A->used; y = A->used;
#if defined(TFM_SQR3) #if defined(TFM_SQR3) && FP_SIZE >= 6
if (y <= 3) { if (y <= 3) {
fp_sqr_comba3(A,B); fp_sqr_comba3(A,B);
return; return;
} }
#endif #endif
#if defined(TFM_SQR4) #if defined(TFM_SQR4) && FP_SIZE >= 8
if (y == 4) { if (y == 4) {
fp_sqr_comba4(A,B); fp_sqr_comba4(A,B);
return; return;
} }
#endif #endif
#if defined(TFM_SQR6) #if defined(TFM_SQR6) && FP_SIZE >= 12
if (y <= 6) { if (y <= 6) {
fp_sqr_comba6(A,B); fp_sqr_comba6(A,B);
return; return;
} }
#endif #endif
#if defined(TFM_SQR7) #if defined(TFM_SQR7) && FP_SIZE >= 14
if (y == 7) { if (y == 7) {
fp_sqr_comba7(A,B); fp_sqr_comba7(A,B);
return; return;
} }
#endif #endif
#if defined(TFM_SQR8) #if defined(TFM_SQR8) && FP_SIZE >= 16
if (y == 8) { if (y == 8) {
fp_sqr_comba8(A,B); fp_sqr_comba8(A,B);
return; return;
} }
#endif #endif
#if defined(TFM_SQR9) #if defined(TFM_SQR9) && FP_SIZE >= 18
if (y == 9) { if (y == 9) {
fp_sqr_comba9(A,B); fp_sqr_comba9(A,B);
return; return;
} }
#endif #endif
#if defined(TFM_SQR12) #if defined(TFM_SQR12) && FP_SIZE >= 24
if (y <= 12) { if (y <= 12) {
fp_sqr_comba12(A,B); fp_sqr_comba12(A,B);
return; return;
} }
#endif #endif
#if defined(TFM_SQR17) #if defined(TFM_SQR17) && FP_SIZE >= 34
if (y <= 17) { if (y <= 17) {
fp_sqr_comba17(A,B); fp_sqr_comba17(A,B);
return; return;
@ -75,37 +75,37 @@ void fp_sqr(fp_int *A, fp_int *B)
return; return;
} }
#endif #endif
#if defined(TFM_SQR20) #if defined(TFM_SQR20) && FP_SIZE >= 40
if (y <= 20) { if (y <= 20) {
fp_sqr_comba20(A,B); fp_sqr_comba20(A,B);
return; return;
} }
#endif #endif
#if defined(TFM_SQR24) #if defined(TFM_SQR24) && FP_SIZE >= 48
if (y <= 24) { if (y <= 24) {
fp_sqr_comba24(A,B); fp_sqr_comba24(A,B);
return; return;
} }
#endif #endif
#if defined(TFM_SQR28) #if defined(TFM_SQR28) && FP_SIZE >= 56
if (y <= 28) { if (y <= 28) {
fp_sqr_comba28(A,B); fp_sqr_comba28(A,B);
return; return;
} }
#endif #endif
#if defined(TFM_SQR32) #if defined(TFM_SQR32) && FP_SIZE >= 64
if (y <= 32) { if (y <= 32) {
fp_sqr_comba32(A,B); fp_sqr_comba32(A,B);
return; return;
} }
#endif #endif
#if defined(TFM_SQR48) #if defined(TFM_SQR48) && FP_SIZE >= 96
if (y <= 48) { if (y <= 48) {
fp_sqr_comba48(A,B); fp_sqr_comba48(A,B);
return; return;
} }
#endif #endif
#if defined(TFM_SQR64) #if defined(TFM_SQR64) && FP_SIZE >= 128
if (y <= 64) { if (y <= 64) {
fp_sqr_comba64(A,B); fp_sqr_comba64(A,B);
return; return;
@ -115,6 +115,6 @@ void fp_sqr(fp_int *A, fp_int *B)
} }
/* $Source$ */ /* $Source: /cvs/libtom/tomsfastmath/src/sqr/fp_sqr.c,v $ */
/* $Revision$ */ /* $Revision: 1.1 $ */
/* $Date$ */ /* $Date: 2006/12/31 21:25:53 $ */