diff --git a/src/sqr/fp_sqr_comba_12.c b/src/sqr/fp_sqr_comba_12.c
index 4a2e2d8..a1ed092 100644
--- a/src/sqr/fp_sqr_comba_12.c
+++ b/src/sqr/fp_sqr_comba_12.c
@@ -134,9 +134,11 @@ void fp_sqr_comba12(fp_int *A, fp_int *B)
    B->used = 24;
    B->sign = FP_ZPOS;
    memcpy(B->dp, b, 24 * sizeof(fp_digit));
-   memset(B->dp + 24, 0, (FP_SIZE - 24) * sizeof(fp_digit));
    fp_clamp(B);
 }
 #endif
 
 
+/* $Source$ */
+/* $Revision$ */
+/* $Date$ */
diff --git a/src/sqr/fp_sqr_comba_17.c b/src/sqr/fp_sqr_comba_17.c
index 015298a..798c190 100644
--- a/src/sqr/fp_sqr_comba_17.c
+++ b/src/sqr/fp_sqr_comba_17.c
@@ -184,9 +184,11 @@ void fp_sqr_comba17(fp_int *A, fp_int *B)
    B->used = 34;
    B->sign = FP_ZPOS;
    memcpy(B->dp, b, 34 * sizeof(fp_digit));
-   memset(B->dp + 34, 0, (FP_SIZE - 34) * sizeof(fp_digit));
    fp_clamp(B);
 }
 #endif
 
 
+/* $Source$ */
+/* $Revision$ */
+/* $Date$ */
diff --git a/src/sqr/fp_sqr_comba_20.c b/src/sqr/fp_sqr_comba_20.c
index d7cb2b9..35b80e5 100644
--- a/src/sqr/fp_sqr_comba_20.c
+++ b/src/sqr/fp_sqr_comba_20.c
@@ -214,9 +214,11 @@ void fp_sqr_comba20(fp_int *A, fp_int *B)
    B->used = 40;
    B->sign = FP_ZPOS;
    memcpy(B->dp, b, 40 * sizeof(fp_digit));
-   memset(B->dp + 40, 0, (FP_SIZE - 40) * sizeof(fp_digit));
    fp_clamp(B);
 }
 #endif
 
 
+/* $Source$ */
+/* $Revision$ */
+/* $Date$ */
diff --git a/src/sqr/fp_sqr_comba_24.c b/src/sqr/fp_sqr_comba_24.c
index 81e146c..7628c32 100644
--- a/src/sqr/fp_sqr_comba_24.c
+++ b/src/sqr/fp_sqr_comba_24.c
@@ -254,9 +254,11 @@ void fp_sqr_comba24(fp_int *A, fp_int *B)
    B->used = 48;
    B->sign = FP_ZPOS;
    memcpy(B->dp, b, 48 * sizeof(fp_digit));
-   memset(B->dp + 48, 0, (FP_SIZE - 48) * sizeof(fp_digit));
    fp_clamp(B);
 }
 #endif
 
 
+/* $Source$ */
+/* $Revision$ */
+/* $Date$ */
diff --git a/src/sqr/fp_sqr_comba_28.c b/src/sqr/fp_sqr_comba_28.c
index 89fd3d6..043574d 100644
--- a/src/sqr/fp_sqr_comba_28.c
+++ b/src/sqr/fp_sqr_comba_28.c
@@ -294,9 +294,11 @@ void fp_sqr_comba28(fp_int *A, fp_int *B)
    B->used = 56;
    B->sign = FP_ZPOS;
    memcpy(B->dp, b, 56 * sizeof(fp_digit));
-   memset(B->dp + 56, 0, (FP_SIZE - 56) * sizeof(fp_digit));
    fp_clamp(B);
 }
 #endif
 
 
+/* $Source$ */
+/* $Revision$ */
+/* $Date$ */
diff --git a/src/sqr/fp_sqr_comba_3.c b/src/sqr/fp_sqr_comba_3.c
index a702fed..7aefa4f 100644
--- a/src/sqr/fp_sqr_comba_3.c
+++ b/src/sqr/fp_sqr_comba_3.c
@@ -44,9 +44,11 @@ void fp_sqr_comba3(fp_int *A, fp_int *B)
    B->used = 6;
    B->sign = FP_ZPOS;
    memcpy(B->dp, b, 6 * sizeof(fp_digit));
-   memset(B->dp + 6, 0, (FP_SIZE - 6) * sizeof(fp_digit));
    fp_clamp(B);
 }
 #endif
 
 
+/* $Source$ */
+/* $Revision$ */
+/* $Date$ */
diff --git a/src/sqr/fp_sqr_comba_32.c b/src/sqr/fp_sqr_comba_32.c
index e2446d8..2e8ca55 100644
--- a/src/sqr/fp_sqr_comba_32.c
+++ b/src/sqr/fp_sqr_comba_32.c
@@ -334,9 +334,11 @@ void fp_sqr_comba32(fp_int *A, fp_int *B)
    B->used = 64;
    B->sign = FP_ZPOS;
    memcpy(B->dp, b, 64 * sizeof(fp_digit));
-   memset(B->dp + 64, 0, (FP_SIZE - 64) * sizeof(fp_digit));
    fp_clamp(B);
 }
 #endif
 
 
+/* $Source$ */
+/* $Revision$ */
+/* $Date$ */
diff --git a/src/sqr/fp_sqr_comba_4.c b/src/sqr/fp_sqr_comba_4.c
index 568f71e..cd8de7e 100644
--- a/src/sqr/fp_sqr_comba_4.c
+++ b/src/sqr/fp_sqr_comba_4.c
@@ -54,9 +54,11 @@ void fp_sqr_comba4(fp_int *A, fp_int *B)
    B->used = 8;
    B->sign = FP_ZPOS;
    memcpy(B->dp, b, 8 * sizeof(fp_digit));
-   memset(B->dp + 8, 0, (FP_SIZE - 8) * sizeof(fp_digit));
    fp_clamp(B);
 }
 #endif
 
 
+/* $Source$ */
+/* $Revision$ */
+/* $Date$ */
diff --git a/src/sqr/fp_sqr_comba_48.c b/src/sqr/fp_sqr_comba_48.c
index c2dc85d..256f7b9 100644
--- a/src/sqr/fp_sqr_comba_48.c
+++ b/src/sqr/fp_sqr_comba_48.c
@@ -494,9 +494,11 @@ void fp_sqr_comba48(fp_int *A, fp_int *B)
    B->used = 96;
    B->sign = FP_ZPOS;
    memcpy(B->dp, b, 96 * sizeof(fp_digit));
-   memset(B->dp + 96, 0, (FP_SIZE - 96) * sizeof(fp_digit));
    fp_clamp(B);
 }
 #endif
 
 
+/* $Source$ */
+/* $Revision$ */
+/* $Date$ */
diff --git a/src/sqr/fp_sqr_comba_6.c b/src/sqr/fp_sqr_comba_6.c
index 951d1e6..2537621 100644
--- a/src/sqr/fp_sqr_comba_6.c
+++ b/src/sqr/fp_sqr_comba_6.c
@@ -74,9 +74,11 @@ void fp_sqr_comba6(fp_int *A, fp_int *B)
    B->used = 12;
    B->sign = FP_ZPOS;
    memcpy(B->dp, b, 12 * sizeof(fp_digit));
-   memset(B->dp + 12, 0, (FP_SIZE - 12) * sizeof(fp_digit));
    fp_clamp(B);
 }
 #endif
 
 
+/* $Source$ */
+/* $Revision$ */
+/* $Date$ */
diff --git a/src/sqr/fp_sqr_comba_64.c b/src/sqr/fp_sqr_comba_64.c
index 49a75c4..88871ac 100644
--- a/src/sqr/fp_sqr_comba_64.c
+++ b/src/sqr/fp_sqr_comba_64.c
@@ -654,9 +654,11 @@ void fp_sqr_comba64(fp_int *A, fp_int *B)
    B->used = 128;
    B->sign = FP_ZPOS;
    memcpy(B->dp, b, 128 * sizeof(fp_digit));
-   memset(B->dp + 128, 0, (FP_SIZE - 128) * sizeof(fp_digit));
    fp_clamp(B);
 }
 #endif
 
 
+/* $Source$ */
+/* $Revision$ */
+/* $Date$ */
diff --git a/src/sqr/fp_sqr_comba_7.c b/src/sqr/fp_sqr_comba_7.c
index 48ab6f3..08c520f 100644
--- a/src/sqr/fp_sqr_comba_7.c
+++ b/src/sqr/fp_sqr_comba_7.c
@@ -84,9 +84,11 @@ void fp_sqr_comba7(fp_int *A, fp_int *B)
    B->used = 14;
    B->sign = FP_ZPOS;
    memcpy(B->dp, b, 14 * sizeof(fp_digit));
-   memset(B->dp + 14, 0, (FP_SIZE - 14) * sizeof(fp_digit));
    fp_clamp(B);
 }
 #endif
 
 
+/* $Source$ */
+/* $Revision$ */
+/* $Date$ */
diff --git a/src/sqr/fp_sqr_comba_8.c b/src/sqr/fp_sqr_comba_8.c
index b648d31..9300b17 100644
--- a/src/sqr/fp_sqr_comba_8.c
+++ b/src/sqr/fp_sqr_comba_8.c
@@ -94,9 +94,11 @@ void fp_sqr_comba8(fp_int *A, fp_int *B)
    B->used = 16;
    B->sign = FP_ZPOS;
    memcpy(B->dp, b, 16 * sizeof(fp_digit));
-   memset(B->dp + 16, 0, (FP_SIZE - 16) * sizeof(fp_digit));
    fp_clamp(B);
 }
 #endif
 
 
+/* $Source$ */
+/* $Revision$ */
+/* $Date$ */
diff --git a/src/sqr/fp_sqr_comba_9.c b/src/sqr/fp_sqr_comba_9.c
index 97be21d..880e29e 100644
--- a/src/sqr/fp_sqr_comba_9.c
+++ b/src/sqr/fp_sqr_comba_9.c
@@ -104,9 +104,11 @@ void fp_sqr_comba9(fp_int *A, fp_int *B)
    B->used = 18;
    B->sign = FP_ZPOS;
    memcpy(B->dp, b, 18 * sizeof(fp_digit));
-   memset(B->dp + 18, 0, (FP_SIZE - 18) * sizeof(fp_digit));
    fp_clamp(B);
 }
 #endif
 
 
+/* $Source$ */
+/* $Revision$ */
+/* $Date$ */
diff --git a/src/sqr/fp_sqr_comba_small_set.c b/src/sqr/fp_sqr_comba_small_set.c
index 3f21b8a..1d505ea 100644
--- a/src/sqr/fp_sqr_comba_small_set.c
+++ b/src/sqr/fp_sqr_comba_small_set.c
@@ -6,8 +6,8 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
 {
    fp_digit *a, b[32], c0, c1, c2, sc0, sc1, sc2;
 #ifdef TFM_ISO
-   fp_word tt;
-#endif
+   fp_word   tt;   
+#endif   
    switch (A->used) { 
    case 1:
       a = A->dp;
@@ -25,7 +25,6 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
       B->used = 2;
       B->sign = FP_ZPOS;
       memcpy(B->dp, b, 2 * sizeof(fp_digit));
-      memset(B->dp + 2, 0, (FP_SIZE - 2) * sizeof(fp_digit));
       fp_clamp(B);
       break;
 
@@ -55,7 +54,6 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
       B->used = 4;
       B->sign = FP_ZPOS;
       memcpy(B->dp, b, 4 * sizeof(fp_digit));
-      memset(B->dp + 4, 0, (FP_SIZE - 4) * sizeof(fp_digit));
       fp_clamp(B);
       break;
 
@@ -95,7 +93,6 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
       B->used = 6;
       B->sign = FP_ZPOS;
       memcpy(B->dp, b, 6 * sizeof(fp_digit));
-      memset(B->dp + 6, 0, (FP_SIZE - 6) * sizeof(fp_digit));
       fp_clamp(B);
       break;
 
@@ -145,7 +142,6 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
       B->used = 8;
       B->sign = FP_ZPOS;
       memcpy(B->dp, b, 8 * sizeof(fp_digit));
-      memset(B->dp + 8, 0, (FP_SIZE - 8) * sizeof(fp_digit));
       fp_clamp(B);
       break;
 
@@ -205,7 +201,6 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
       B->used = 10;
       B->sign = FP_ZPOS;
       memcpy(B->dp, b, 10 * sizeof(fp_digit));
-      memset(B->dp + 10, 0, (FP_SIZE - 10) * sizeof(fp_digit));
       fp_clamp(B);
       break;
 
@@ -275,7 +270,6 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
       B->used = 12;
       B->sign = FP_ZPOS;
       memcpy(B->dp, b, 12 * sizeof(fp_digit));
-      memset(B->dp + 12, 0, (FP_SIZE - 12) * sizeof(fp_digit));
       fp_clamp(B);
       break;
 
@@ -355,7 +349,6 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
       B->used = 14;
       B->sign = FP_ZPOS;
       memcpy(B->dp, b, 14 * sizeof(fp_digit));
-      memset(B->dp + 14, 0, (FP_SIZE - 14) * sizeof(fp_digit));
       fp_clamp(B);
       break;
 
@@ -445,7 +438,6 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
       B->used = 16;
       B->sign = FP_ZPOS;
       memcpy(B->dp, b, 16 * sizeof(fp_digit));
-      memset(B->dp + 16, 0, (FP_SIZE - 16) * sizeof(fp_digit));
       fp_clamp(B);
       break;
 
@@ -545,7 +537,6 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
       B->used = 18;
       B->sign = FP_ZPOS;
       memcpy(B->dp, b, 18 * sizeof(fp_digit));
-      memset(B->dp + 18, 0, (FP_SIZE - 18) * sizeof(fp_digit));
       fp_clamp(B);
       break;
 
@@ -655,7 +646,6 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
       B->used = 20;
       B->sign = FP_ZPOS;
       memcpy(B->dp, b, 20 * sizeof(fp_digit));
-      memset(B->dp + 20, 0, (FP_SIZE - 20) * sizeof(fp_digit));
       fp_clamp(B);
       break;
 
@@ -775,7 +765,6 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
       B->used = 22;
       B->sign = FP_ZPOS;
       memcpy(B->dp, b, 22 * sizeof(fp_digit));
-      memset(B->dp + 22, 0, (FP_SIZE - 22) * sizeof(fp_digit));
       fp_clamp(B);
       break;
 
@@ -905,7 +894,6 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
       B->used = 24;
       B->sign = FP_ZPOS;
       memcpy(B->dp, b, 24 * sizeof(fp_digit));
-      memset(B->dp + 24, 0, (FP_SIZE - 24) * sizeof(fp_digit));
       fp_clamp(B);
       break;
 
@@ -1045,7 +1033,6 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
       B->used = 26;
       B->sign = FP_ZPOS;
       memcpy(B->dp, b, 26 * sizeof(fp_digit));
-      memset(B->dp + 26, 0, (FP_SIZE - 26) * sizeof(fp_digit));
       fp_clamp(B);
       break;
 
@@ -1195,7 +1182,6 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
       B->used = 28;
       B->sign = FP_ZPOS;
       memcpy(B->dp, b, 28 * sizeof(fp_digit));
-      memset(B->dp + 28, 0, (FP_SIZE - 28) * sizeof(fp_digit));
       fp_clamp(B);
       break;
 
@@ -1355,7 +1341,6 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
       B->used = 30;
       B->sign = FP_ZPOS;
       memcpy(B->dp, b, 30 * sizeof(fp_digit));
-      memset(B->dp + 30, 0, (FP_SIZE - 30) * sizeof(fp_digit));
       fp_clamp(B);
       break;
 
@@ -1525,11 +1510,13 @@ void fp_sqr_comba_small(fp_int *A, fp_int *B)
       B->used = 32;
       B->sign = FP_ZPOS;
       memcpy(B->dp, b, 32 * sizeof(fp_digit));
-      memset(B->dp + 32, 0, (FP_SIZE - 32) * sizeof(fp_digit));
       fp_clamp(B);
       break;
-
 }
 }
 
 #endif /* TFM_SMALL_SET */
+
+/* $Source$ */
+/* $Revision$ */
+/* $Date$ */