copy in from cvs; cvs2svn fucked up big time

git-svn-id: file:///srv/svn/joey/trunk/src/packages/bsdgames@9775 a4a2c43b-8ac3-0310-8836-e0e880c912e2

factor/Makefile.bsd

@@ -1,11 +1,23 @@
-#	$NetBSD: Makefile,v 1.7 1997/10/22 04:43:26 lukem Exp $
+#	$NetBSD: Makefile,v 1.10 2002/09/19 03:15:39 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
+# For MKCRYPTO
+.include <bsd.own.mk>
+
+PRIMES=	${NETBSDSRCDIR}/games/primes
+
 PROG=	factor
 SRCS=	factor.c pr_tbl.c
-CPPFLAGS+=-I${.CURDIR}/../primes
+CPPFLAGS+=-I${PRIMES}
+
+.if (${MKCRYPTO} != "no")
+CPPFLAGS+=-DHAVE_OPENSSL
+LDADD+=	-lcrypto
+DPADD+=	${LIBCRYPTO}
+.endif
+
 MAN=	factor.6
 MLINKS+=factor.6 primes.6
-.PATH:	${.CURDIR}/../primes
+.PATH:	${PRIMES}
 
 .include <bsd.prog.mk>

factor/Makefrag

@@ -1,4 +1,30 @@
 # Makefrag - makefile fragment for factor
+#
+# Copyright (c) 1997, 1998, 1999 Joseph Samuel Myers.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
 
 # _GNU_SOURCE for isblank()
 factor_DEFS := -D_GNU_SOURCE
@@ -11,6 +37,3 @@ factor_install:	factor_all
 	$(INSTALL_BINARY) factor/factor $(INSTALL_PREFIX)$(GAMESDIR)/factor
 	$(HIDE_GAME) factor
 	$(INSTALL_MANUAL) factor/factor.6
-
-factor_check:	factor_all
-	factor/factor 69300

factor/factor.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: factor.c,v 1.8 1998/09/13 15:27:27 hubertf Exp $	*/
+/*	$NetBSD: factor.c,v 1.13 2002/06/18 23:07:36 simonb Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -46,7 +46,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
 #if 0
 static char sccsid[] = "@(#)factor.c	8.4 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: factor.c,v 1.8 1998/09/13 15:27:27 hubertf Exp $");
+__RCSID("$NetBSD: factor.c,v 1.13 2002/06/18 23:07:36 simonb Exp $");
 #endif
 #endif /* not lint */
 
@@ -69,37 +69,85 @@ __RCSID("$NetBSD: factor.c,v 1.8 1998/09/13 15:27:27 hubertf Exp $");
  * If no args are given, the list of numbers are read from stdin.
  */
 
-#include <err.h>
 #include <ctype.h>
+#include <err.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 
+#ifdef HAVE_OPENSSL
+#include <openssl/bn.h>
+#else
+typedef long	BIGNUM;
+typedef u_long	BN_ULONG;
+int	BN_dec2bn(BIGNUM **a, const char *str);
+#define BN_new()		((BIGNUM *)calloc(sizeof(BIGNUM), 1))
+#define BN_is_zero(v)		(*(v) == 0)
+#define BN_is_one(v)		(*(v) == 1)
+#define BN_new()		((BIGNUM *)calloc(sizeof(BIGNUM), 1))
+#define BN_is_zero(v)		(*(v) == 0)
+#define BN_is_one(v)		(*(v) == 1)
+#define BN_mod_word(a, b)	(*(a) % (b))
+#endif
+
 #include "primes.h"
 
 /*
  * prime[i] is the (i-1)th prime.
  *
- * We are able to sieve 2^32-1 because this byte table yields all primes 
+ * 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 */
 
-int	main __P((int, char *[]));
-void	pr_fact __P((ubig));	/* print factors of a value */
-void	usage __P((void)) __attribute__((__noreturn__));
+#define	PRIME_CHECKS	5
+
+#ifdef HAVE_OPENSSL 
+BN_CTX *ctx;				/* just use a global context */
+#endif
+
+int	main(int, char *[]);
+void	pr_fact(BIGNUM *);		/* print factors of a value */
+void	BN_print_dec_fp(FILE *, const BIGNUM *);
+void	usage(void) __attribute__((__noreturn__));
+#ifdef HAVE_OPENSSL
+void	pollard_pminus1(BIGNUM *);	/* print factors for big numbers */
+#else
+char	*BN_bn2dec(const BIGNUM *);
+BN_ULONG BN_div_word(BIGNUM *, BN_ULONG);
+#endif
+
+
+#ifndef HAVE_OPENSSL
+int
+BN_dec2bn(BIGNUM **a, const char *str)
+{
+	char *p;
+
+	errno = 0;
+	**a = strtoul(str, &p, 10);
+	if (errno)
+		err(1, "%s", str);
+	return (*p == '\n' || *p == '\0');
+}
+#endif
 
 int
-main(argc, argv)
-	int argc;
-	char *argv[];
+main(int argc, char *argv[])
 {
-	ubig val;
+	BIGNUM *val;
 	int ch;
-	char *p, buf[100];		/* > max number of digits. */
+	char *p, buf[LINE_MAX];		/* > max number of digits. */
+
+#ifdef HAVE_OPENSSL 
+	ctx = BN_CTX_new();
+#endif
+	val = BN_new();
+	if (val == NULL)
+		errx(1, "can't initialise bignum");
 
 	/* Revoke setgid privileges */
 	setregid(getgid(), getgid());
@@ -126,12 +174,8 @@ main(argc, argv)
 				continue;
 			if (*p == '-')
 				errx(1, "negative numbers aren't permitted.");
-			errno = 0;
-			val = strtoul(buf, &p, 10);
-			if (errno)
-				err(1, "%s", buf);
-			if (*p != '\n')
-				errx(1, "%s: illegal numeric format.", buf);
+			if (BN_dec2bn(&val, buf) == 0)
+				errx(1, "%s: illegal numeric format.", argv[0]);
 			pr_fact(val);
 		}
 	/* Factor the arguments. */
@@ -139,11 +183,7 @@ main(argc, argv)
 		for (; *argv != NULL; ++argv) {
 			if (argv[0][0] == '-')
 				errx(1, "negative numbers aren't permitted.");
-			errno = 0;
-			val = strtoul(argv[0], &p, 10);
-			if (errno)
-				err(1, "%s", argv[0]);
-			if (*p != '\0')
+			if (BN_dec2bn(&val, argv[0]) == 0)
 				errx(1, "%s: illegal numeric format.", argv[0]);
 			pr_fact(val);
 		}
@@ -164,49 +204,152 @@ main(argc, argv)
  * Factors are printed with leading tabs.
  */
 void
-pr_fact(val)
-	ubig val;		/* Factor this value. */
+pr_fact(BIGNUM *val)
 {
 	const ubig *fact;		/* The factor found. */
 
 	/* Firewall - catch 0 and 1. */
-	if (val == 0)		/* Historical practice; 0 just exits. */
+	if (BN_is_zero(val))	/* Historical practice; 0 just exits. */
 		exit(0);
-	if (val == 1) {
-		(void)printf("1: 1\n");
+	if (BN_is_one(val)) {
+		printf("1: 1\n");
 		return;
 	}
 
 	/* Factor value. */
-	(void)printf("%lu:", val);
-	for (fact = &prime[0]; val > 1; ++fact) {
+
+	BN_print_dec_fp(stdout, val);
+	putchar(':');
+	for (fact = &prime[0]; !BN_is_one(val); ++fact) {
 		/* Look for the smallest factor. */
 		do {
-			if (val % (long)*fact == 0)
+			if (BN_mod_word(val, (BN_ULONG)*fact) == 0)
 				break;
 		} while (++fact <= pr_limit);
 
 		/* Watch for primes larger than the table. */
 		if (fact > pr_limit) {
-			(void)printf(" %lu", val);
+#ifdef HAVE_OPENSSL
+			BIGNUM *bnfact;
+
+			bnfact = BN_new();
+			BN_set_word(bnfact, *(fact - 1));
+			BN_sqr(bnfact, bnfact, ctx);
+			if (BN_cmp(bnfact, val) > 0) {
+				putchar(' ');
+				BN_print_dec_fp(stdout, val);
+			} else
+				pollard_pminus1(val);
+#else
+			printf(" %s", BN_bn2dec(val));
+#endif
 			break;
 		}
 
 		/* Divide factor out until none are left. */
 		do {
-			(void)printf(" %lu", *fact);
-			val /= (long)*fact;
-		} while ((val % (long)*fact) == 0);
+			printf(" %lu", *fact);
+			BN_div_word(val, (BN_ULONG)*fact);
+		} while (BN_mod_word(val, (BN_ULONG)*fact) == 0);
 
 		/* Let the user know we're doing something. */
-		(void)fflush(stdout);
+		fflush(stdout);
 	}
-	(void)putchar('\n');
+	putchar('\n');
+}
+
+/*
+ * Sigh..  No _decimal_ output to file functions in BN.
+ */
+void
+BN_print_dec_fp(FILE *fp, const BIGNUM *num)
+{
+	char *buf;
+	
+	buf = BN_bn2dec(num);
+	if (buf == NULL)
+		return;	/* XXX do anything here? */
+	fprintf(fp, buf);
+	free(buf);
 }
 
 void
-usage()
+usage(void)
 {
-	(void)fprintf(stderr, "usage: factor [value ...]\n");
+	fprintf(stderr, "usage: factor [value ...]\n");
 	exit (0);
 }
+
+
+
+
+#ifdef HAVE_OPENSSL
+/* pollard rho, algorithm from Jim Gillogly, May 2000 */
+
+void
+pollard_pminus1(BIGNUM *val)
+{
+	BIGNUM *base, *num, *i, *x;
+
+	base = BN_new();
+	num = BN_new();
+	i = BN_new();
+	x = BN_new();
+
+	BN_set_word(i, 2);
+	BN_set_word(base, 2);
+
+	for (;;) {
+		BN_mod_exp(base, base, i, val, ctx);
+
+		BN_copy(x, base);
+		BN_sub_word(x, 1);
+		BN_gcd(x, x, val, ctx);
+
+		if (!BN_is_one(x)) {
+			if (BN_is_prime(x, PRIME_CHECKS, NULL, NULL,
+			    NULL) == 1) {
+				putchar(' ');
+				BN_print_dec_fp(stdout, x);
+			} else
+				pollard_pminus1(x);
+			fflush(stdout);
+
+			BN_div(num, NULL, val, x, ctx);
+			if (BN_is_one(num))
+				return;
+			if (BN_is_prime(num, PRIME_CHECKS, NULL, NULL,
+			    NULL) == 1) {
+				putchar(' ');
+				BN_print_dec_fp(stdout, num);
+				fflush(stdout);
+				return;
+			}
+			BN_copy(val, num);
+		}
+		BN_add_word(i, 1);
+	}
+}
+#else
+char *
+BN_bn2dec(const BIGNUM *val)
+{
+	char *buf;
+
+	buf = malloc(100);
+	if (!buf)
+		return buf;
+	snprintf(buf, 100, "%ld", (long)*val);
+	return buf;
+}
+
+BN_ULONG
+BN_div_word(BIGNUM *a, BN_ULONG b)
+{
+	BN_ULONG mod;
+
+	mod = *a % b;
+	*a /= b;
+	return mod;
+}
+#endif