diff options
Diffstat (limited to 'moduli.c')
-rw-r--r-- | moduli.c | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: moduli.c,v 1.10 2005/01/17 03:25:46 dtucker Exp $ */ | 1 | /* $OpenBSD: moduli.c,v 1.11 2005/05/23 22:44:01 avsm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 1994 Phil Karn <karn@qualcomm.com> | 3 | * Copyright 1994 Phil Karn <karn@qualcomm.com> |
4 | * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com> | 4 | * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com> |
@@ -144,7 +144,7 @@ static u_int32_t *LargeSieve, largewords, largetries, largenumbers; | |||
144 | static u_int32_t largebits, largememory; /* megabytes */ | 144 | static u_int32_t largebits, largememory; /* megabytes */ |
145 | static BIGNUM *largebase; | 145 | static BIGNUM *largebase; |
146 | 146 | ||
147 | int gen_candidates(FILE *, int, int, BIGNUM *); | 147 | int gen_candidates(FILE *, u_int32_t, u_int32_t, BIGNUM *); |
148 | int prime_test(FILE *, FILE *, u_int32_t, u_int32_t); | 148 | int prime_test(FILE *, FILE *, u_int32_t, u_int32_t); |
149 | 149 | ||
150 | /* | 150 | /* |
@@ -241,14 +241,15 @@ sieve_large(u_int32_t s) | |||
241 | * The list is checked against small known primes (less than 2**30). | 241 | * The list is checked against small known primes (less than 2**30). |
242 | */ | 242 | */ |
243 | int | 243 | int |
244 | gen_candidates(FILE *out, int memory, int power, BIGNUM *start) | 244 | gen_candidates(FILE *out, u_int32_t memory, u_int32_t power, BIGNUM *start) |
245 | { | 245 | { |
246 | BIGNUM *q; | 246 | BIGNUM *q; |
247 | u_int32_t j, r, s, t; | 247 | u_int32_t j, r, s, t; |
248 | u_int32_t smallwords = TINY_NUMBER >> 6; | 248 | u_int32_t smallwords = TINY_NUMBER >> 6; |
249 | u_int32_t tinywords = TINY_NUMBER >> 6; | 249 | u_int32_t tinywords = TINY_NUMBER >> 6; |
250 | time_t time_start, time_stop; | 250 | time_t time_start, time_stop; |
251 | int i, ret = 0; | 251 | u_int32_t i; |
252 | int ret = 0; | ||
252 | 253 | ||
253 | largememory = memory; | 254 | largememory = memory; |
254 | 255 | ||
@@ -548,7 +549,7 @@ prime_test(FILE *in, FILE *out, u_int32_t trials, u_int32_t generator_wanted) | |||
548 | * due to earlier inconsistencies in interpretation, check | 549 | * due to earlier inconsistencies in interpretation, check |
549 | * the proposed bit size. | 550 | * the proposed bit size. |
550 | */ | 551 | */ |
551 | if (BN_num_bits(p) != (in_size + 1)) { | 552 | if ((u_int32_t)BN_num_bits(p) != (in_size + 1)) { |
552 | debug2("%10u: bit size %u mismatch", count_in, in_size); | 553 | debug2("%10u: bit size %u mismatch", count_in, in_size); |
553 | continue; | 554 | continue; |
554 | } | 555 | } |