diff options
Diffstat (limited to 'factor/factor.c')
| -rw-r--r-- | factor/factor.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/factor/factor.c b/factor/factor.c index f2ff2e4b..0af41a14 100644 --- a/factor/factor.c +++ b/factor/factor.c @@ -1,4 +1,4 @@ -/* $NetBSD: factor.c,v 1.26 2011/11/09 20:17:44 drochner Exp $ */ +/* $NetBSD: factor.c,v 1.27 2014/10/02 21:36:37 ast Exp $ */ /* * Copyright (c) 1989, 1993 @@ -42,16 +42,14 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\ #if 0 static char sccsid[] = "@(#)factor.c 8.4 (Berkeley) 5/4/95"; #else -__RCSID("$NetBSD: factor.c,v 1.26 2011/11/09 20:17:44 drochner Exp $"); +__RCSID("$NetBSD: factor.c,v 1.27 2014/10/02 21:36:37 ast Exp $"); #endif #endif /* not lint */ /* * factor - factor a number into primes * - * By: Landon Curt Noll chongo@toad.com, ...!{sun,tolsoft}!hoptoad!chongo - * - * chongo <for a good prime call: 391581 * 2^216193 - 1> /\oo/\ + * By Landon Curt Noll, http://www.isthe.com/chongo/index.html /\oo/\ * * usage: * factor [number] ... @@ -72,6 +70,7 @@ __RCSID("$NetBSD: factor.c,v 1.26 2011/11/09 20:17:44 drochner Exp $"); #include <stdio.h> #include <stdlib.h> #include <unistd.h> +#include <inttypes.h> #ifdef HAVE_OPENSSL #include <openssl/bn.h> @@ -93,8 +92,7 @@ static int BN_dec2bn(BIGNUM **a, const char *str); * We are able to sieve 2^32-1 because this byte table yields all primes * up to 65537 and 65537^2 > 2^32-1. */ -extern const ubig prime[]; -extern const ubig *pr_limit; /* largest prime in the prime array */ + #if 0 /* debugging: limit table use to stress the "pollard" code */ #define pr_limit &prime[0] #endif @@ -198,7 +196,7 @@ main(int argc, char *argv[]) static void pr_fact(BIGNUM *val) { - const ubig *fact; /* The factor found. */ + const uint64_t *fact; /* The factor found. */ /* Firewall - catch 0 and 1. */ if (BN_is_zero(val) || BN_is_one(val)) @@ -239,7 +237,7 @@ pr_fact(BIGNUM *val) /* Divide factor out until none are left. */ do { - printf(" %lu", *fact); + printf(" %" PRIu64, *fact); BN_div_word(val, (BN_ULONG)*fact); } while (BN_mod_word(val, (BN_ULONG)*fact) == 0); |