projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updates.
[silc.git]
/
lib
/
silcmath
/
silcprimegen.c
diff --git
a/lib/silcmath/silcprimegen.c
b/lib/silcmath/silcprimegen.c
index beb07f285f87ea09d3cba6d34638a4f66c9682ce..e868637c66fbb99df9d0ced69a24b72564e4c5dd 100644
(file)
--- a/
lib/silcmath/silcprimegen.c
+++ b/
lib/silcmath/silcprimegen.c
@@
-195,19
+195,21
@@
static uint32 primetable[] =
If argument verbose is TRUE this will display some status information
about the progress of generation. */
If argument verbose is TRUE this will display some status information
about the progress of generation. */
-int silc_math_gen_prime(SilcInt *prime, uint32 bits, int verbose)
+int silc_math_gen_prime(Silc
MP
Int *prime, uint32 bits, int verbose)
{
unsigned char *numbuf;
uint32 i, b, k;
uint32 *spmods;
{
unsigned char *numbuf;
uint32 i, b, k;
uint32 *spmods;
- SilcInt r, base, tmp, tmp2, oprime;
+ Silc
MP
Int r, base, tmp, tmp2, oprime;
silc_mp_init(&r);
silc_mp_init(&r);
- silc_mp_init
_set_ui(&base, 2
);
+ silc_mp_init
(&base
);
silc_mp_init(&tmp);
silc_mp_init(&tmp2);
silc_mp_init(&oprime);
silc_mp_init(&tmp);
silc_mp_init(&tmp2);
silc_mp_init(&oprime);
+ silc_mp_set_ui(&base, 2);
+
SILC_LOG_DEBUG(("Generating new prime"));
/* Get random number */
SILC_LOG_DEBUG(("Generating new prime"));
/* Get random number */
@@
-225,7
+227,7
@@
int silc_math_gen_prime(SilcInt *prime, uint32 bits, int verbose)
/* Number could be even number, so we'll make it odd. */
silc_mp_set_ui(&tmp, 1);
/* Number could be even number, so we'll make it odd. */
silc_mp_set_ui(&tmp, 1);
- silc_mp_
ior(prime, prime, &tmp);
/* OR operator */
+ silc_mp_
or(prime, prime, &tmp);
/* OR operator */
/* Init modulo table with the prime candidate and the primes
in the primetable. */
/* Init modulo table with the prime candidate and the primes
in the primetable. */
@@
-263,7
+265,7
@@
int silc_math_gen_prime(SilcInt *prime, uint32 bits, int verbose)
/* Does the prime pass the Fermat's prime test.
* r = 2 ^ p mod p, if r == 2, then p is probably a prime.
*/
/* Does the prime pass the Fermat's prime test.
* r = 2 ^ p mod p, if r == 2, then p is probably a prime.
*/
- silc_mp_pow
m
(&r, &base, &oprime, &oprime);
+ silc_mp_pow
_mod
(&r, &base, &oprime, &oprime);
if (silc_mp_cmp_ui(&r, 2) != 0) {
if (verbose) {
printf(".");
if (silc_mp_cmp_ui(&r, 2) != 0) {
if (verbose) {
printf(".");
@@
-289,11
+291,11
@@
int silc_math_gen_prime(SilcInt *prime, uint32 bits, int verbose)
}
silc_free(spmods);
}
silc_free(spmods);
- silc_mp_
clear
(&r);
- silc_mp_
clear
(&base);
- silc_mp_
clear
(&tmp);
- silc_mp_
clear
(&tmp2);
- silc_mp_
clear
(&oprime);
+ silc_mp_
uninit
(&r);
+ silc_mp_
uninit
(&base);
+ silc_mp_
uninit
(&tmp);
+ silc_mp_
uninit
(&tmp2);
+ silc_mp_
uninit
(&oprime);
return TRUE;
}
return TRUE;
}
@@
-301,14
+303,15
@@
int silc_math_gen_prime(SilcInt *prime, uint32 bits, int verbose)
/* Performs primality testings for given number. Returns TRUE if the
number is probably a prime. */
/* Performs primality testings for given number. Returns TRUE if the
number is probably a prime. */
-int silc_math_prime_test(SilcInt *p)
+int silc_math_prime_test(Silc
MP
Int *p)
{
{
- SilcInt r, base, tmp;
+ Silc
MP
Int r, base, tmp;
int i, ret = 0;
silc_mp_init(&r);
silc_mp_init(&tmp);
int i, ret = 0;
silc_mp_init(&r);
silc_mp_init(&tmp);
- silc_mp_init_set_ui(&base, 2);
+ silc_mp_init(&base);
+ silc_mp_set_ui(&base, 2);
SILC_LOG_DEBUG(("Testing probability of prime"));
SILC_LOG_DEBUG(("Testing probability of prime"));
@@
-325,13
+328,13
@@
int silc_math_prime_test(SilcInt *p)
/* Does the prime pass the Fermat's prime test.
* r = 2 ^ p mod p, if r == 2, then p is probably a prime.
*/
/* Does the prime pass the Fermat's prime test.
* r = 2 ^ p mod p, if r == 2, then p is probably a prime.
*/
- silc_mp_pow
m
(&r, &base, p, p);
+ silc_mp_pow
_mod
(&r, &base, p, p);
if (silc_mp_cmp_ui(&r, 2) != 0)
ret = -1;
if (silc_mp_cmp_ui(&r, 2) != 0)
ret = -1;
- silc_mp_
clear
(&r);
- silc_mp_
clear
(&tmp);
- silc_mp_
clear
(&base);
+ silc_mp_
uninit
(&r);
+ silc_mp_
uninit
(&tmp);
+ silc_mp_
uninit
(&base);
if (ret)
return FALSE;
if (ret)
return FALSE;