bugfix in bn_mp_kronecker.c, cleanup and formatting in div. files
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179
diff --git a/bn_mp_get_bit.c b/bn_mp_get_bit.c
index 000df13..e1e95f5 100644
--- a/bn_mp_get_bit.c
+++ b/bn_mp_get_bit.c
@@ -49,3 +49,7 @@ int mp_get_bit(const mp_int *a, int b)
}
#endif
+
+/* ref: $Format:%D$ */
+/* git commit: $Format:%H$ */
+/* commit time: $Format:%ai$ */
diff --git a/bn_mp_kronecker.c b/bn_mp_kronecker.c
index 7124056..7b56e89 100644
--- a/bn_mp_kronecker.c
+++ b/bn_mp_kronecker.c
@@ -131,11 +131,15 @@ int mp_kronecker(const mp_int *a, const mp_int *p, int *c)
LBL_KRON:
mp_clear(&r);
LBL_KRON_1:
- mp_clear(&a1);
-LBL_KRON_0:
mp_clear(&p1);
+LBL_KRON_0:
+ mp_clear(&a1);
+
return e;
}
-
#endif
+
+/* ref: $Format:%D$ */
+/* git commit: $Format:%H$ */
+/* commit time: $Format:%ai$ */
diff --git a/bn_mp_prime_frobenius_underwood.c b/bn_mp_prime_frobenius_underwood.c
index 323e8ca..d9040a1 100644
--- a/bn_mp_prime_frobenius_underwood.c
+++ b/bn_mp_prime_frobenius_underwood.c
@@ -190,3 +190,7 @@ LBL_FU_ERR:
#endif
#endif
+
+/* ref: $Format:%D$ */
+/* git commit: $Format:%H$ */
+/* commit time: $Format:%ai$ */
diff --git a/bn_mp_prime_is_prime.c b/bn_mp_prime_is_prime.c
index d8755a0..d341563 100644
--- a/bn_mp_prime_is_prime.c
+++ b/bn_mp_prime_is_prime.c
@@ -14,7 +14,7 @@
*/
/* portable integer log of two with small footprint */
-static unsigned int floor_ilog2(int value)
+static unsigned int s_floor_ilog2(int value)
{
unsigned int r = 0;
while ((value >>= 1) != 0) {
@@ -214,7 +214,7 @@ int mp_prime_is_prime(const mp_int *a, int t, int *result)
}
}
- // for compatibility with the current API (well, compatible within a sign's width)
+ /* for compatibility with the current API (well, compatible within a sign's width) */
if (p_max < t) {
p_max = t;
}
@@ -252,8 +252,8 @@ int mp_prime_is_prime(const mp_int *a, int t, int *result)
/*
Assuming the General Rieman hypothesis (never thought to write that in a
comment) the upper bound can be lowered to 2*(log a)^2.
- E. Bach, “Explicit bounds for primality testing and related problems,”
- Math. Comp. 55 (1990), 355–380.
+ E. Bach, "Explicit bounds for primality testing and related problems,"
+ Math. Comp. 55 (1990), 355-380.
size_a = (size_a/10) * 7;
len = 2 * (size_a * size_a);
@@ -262,7 +262,7 @@ int mp_prime_is_prime(const mp_int *a, int t, int *result)
floor(2048/10)*7 = 1428
2 * 1428^2 = 4078368
-
+
(would have been ~4030331.9962 with floats and natural log instead)
That number is smaller than 2^28, the default bit-size of mp_digit.
*/
@@ -288,7 +288,7 @@ int mp_prime_is_prime(const mp_int *a, int t, int *result)
if ((err = mp_rand(&b, 1)) != MP_OKAY) {
goto LBL_B;
}
- /*
+ /*
* Reduce digit before casting because mp_digit might be bigger than
* an unsigned int and "mask" on the other side is most probably not.
*/
diff --git a/bn_mp_prime_strong_lucas_selfridge.c b/bn_mp_prime_strong_lucas_selfridge.c
index 8789139..9835df7 100644
--- a/bn_mp_prime_strong_lucas_selfridge.c
+++ b/bn_mp_prime_strong_lucas_selfridge.c
@@ -29,7 +29,7 @@
* multiply bigint a with int d and put the result in c
* Like mp_mul_d() but with a signed long as the small input
*/
-static int mp_mul_si(const mp_int *a, long d, mp_int *c)
+static int s_mp_mul_si(const mp_int *a, long d, mp_int *c)
{
mp_int t;
int err, neg = 0;
@@ -407,3 +407,7 @@ LBL_LS_ERR:
#endif
#endif
#endif
+
+/* ref: $Format:%D$ */
+/* git commit: $Format:%H$ */
+/* commit time: $Format:%ai$ */
diff --git a/demo/demo.c b/demo/demo.c
index 8bc7eb6..d8e52e8 100644
--- a/demo/demo.c
+++ b/demo/demo.c
@@ -124,7 +124,7 @@ struct mp_kronecker_st {
int c[21];
};
static struct mp_kronecker_st kronecker[] = {
- //-10, -9, -8, -7,-6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
+ /*-10, -9, -8, -7,-6, -5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10*/
{ -10, { 0, -1, 0, -1, 0, 0, 0, 1, 0, -1, 0, 1, 0, -1, 0, 0, 0, 1, 0, 1, 0 } },
{ -9, { -1, 0, -1, 1, 0, -1, -1, 0, -1, -1, 0, 1, 1, 0, 1, 1, 0, -1, 1, 0, 1 } },
{ -8, { 0, -1, 0, 1, 0, 1, 0, -1, 0, -1, 0, 1, 0, 1, 0, -1, 0, -1, 0, 1, 0 } },
@@ -674,7 +674,7 @@ int main(void)
printf("\n");
- // strong Miller-Rabin pseudoprime to the first 200 primes (F. Arnault)
+ /* strong Miller-Rabin pseudoprime to the first 200 primes (F. Arnault) */
puts("Testing mp_prime_is_prime() with Arnault's pseudoprime 803...901 \n");
mp_read_radix(&a,"91xLNF3roobhzgTzoFIG6P13ZqhOVYSN60Fa7Cj2jVR1g0k89zdahO9/kAiRprpfO1VAp1aBHucLFV/qLKLFb+zonV7R2Vxp1K13ClwUXStpV0oxTNQVjwybmFb5NBEHImZ6V7P6+udRJuH8VbMEnS0H8/pSqQrg82OoQQ2fPpAk6G1hkjqoCv5s/Yr",64);
mp_prime_is_prime(&a, 8, &cnt);
@@ -682,7 +682,7 @@ int main(void)
printf("Arnault's pseudoprime is not prime but mp_prime_is_prime says it is.\n");
return EXIT_FAILURE;
}
- // About the same size as Arnault's pseudoprime
+ /* About the same size as Arnault's pseudoprime */
puts("Testing mp_prime_is_prime() with certified prime 2^1119 + 53\n");
mp_set(&a,1u);
mp_mul_2d(&a,1119,&a);
diff --git a/tommath_class.h b/tommath_class.h
index a6b440c..aa9f828 100644
--- a/tommath_class.h
+++ b/tommath_class.h
@@ -1,3 +1,16 @@
+/* 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.
+ */
+
#if !(defined(LTM1) && defined(LTM2) && defined(LTM3))
#if defined(LTM2)
# define LTM3
@@ -1206,3 +1219,7 @@
#else
# define LTM_LAST
#endif
+
+/* ref: $Format:%D$ */
+/* git commit: $Format:%H$ */
+/* commit time: $Format:%ai$ */