===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/moduli.c,v
retrieving revision 1.12.2.2
retrieving revision 1.13
diff -u -r1.12.2.2 -r1.13
--- src/usr.bin/ssh/moduli.c	2006/11/08 00:44:05	1.12.2.2
+++ src/usr.bin/ssh/moduli.c	2006/03/25 00:05:41	1.13
@@ -1,4 +1,4 @@
-/* $OpenBSD: moduli.c,v 1.12.2.2 2006/11/08 00:44:05 brad Exp $ */
+/* $OpenBSD: moduli.c,v 1.13 2006/03/25 00:05:41 djm Exp $ */
 /*
  * Copyright 1994 Phil Karn <karn@qualcomm.com>
  * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com>
@@ -37,19 +37,12 @@
  * Second step: test primes' safety (processor intensive)
  */
 
-#include <sys/types.h>
-
-#include <openssl/bn.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <time.h>
-
+#include "includes.h"
 #include "xmalloc.h"
 #include "log.h"
 
+#include <openssl/bn.h>
+
 /*
  * File output defines
  */
@@ -325,26 +318,20 @@
 
 	/* validation check: count the number of primes tried */
 	largetries = 0;
-	if ((q = BN_new()) == NULL)
-		fatal("BN_new failed");
+	q = BN_new();
 
 	/*
 	 * Generate random starting point for subprime search, or use
 	 * specified parameter.
 	 */
-	if ((largebase = BN_new()) == NULL)
-		fatal("BN_new failed");
-	if (start == NULL) {
-		if (BN_rand(largebase, power, 1, 1) == 0)
-			fatal("BN_rand failed");
-	} else {
-		if (BN_copy(largebase, start) == NULL)
-			fatal("BN_copy: failed");
-	}
+	largebase = BN_new();
+	if (start == NULL)
+		BN_rand(largebase, power, 1, 1);
+	else
+		BN_copy(largebase, start);
 
 	/* ensure odd */
-	if (BN_set_bit(largebase, 0) == 0)
-		fatal("BN_set_bit: failed");
+	BN_set_bit(largebase, 0);
 
 	time(&time_start);
 
@@ -428,10 +415,8 @@
 			continue; /* Definitely composite, skip */
 
 		debug2("test q = largebase+%u", 2 * j);
-		if (BN_set_word(q, 2 * j) == 0)
-			fatal("BN_set_word failed");
-		if (BN_add(q, q, largebase) == 0)
-			fatal("BN_add failed");
+		BN_set_word(q, 2 * j);
+		BN_add(q, q, largebase);
 		if (qfileout(out, QTYPE_SOPHIE_GERMAIN, QTEST_SIEVE,
 		    largetries, (power - 1) /* MSB */, (0), q) == -1) {
 			ret = -1;
@@ -476,12 +461,9 @@
 
 	time(&time_start);
 
-	if ((p = BN_new()) == NULL)
-		fatal("BN_new failed");
-	if ((q = BN_new()) == NULL)
-		fatal("BN_new failed");
-	if ((ctx = BN_CTX_new()) == NULL)
-		fatal("BN_CTX_new failed");
+	p = BN_new();
+	q = BN_new();
+	ctx = BN_CTX_new();
 
 	debug2("%.24s Final %u Miller-Rabin trials (%x generator)",
 	    ctime(&time_start), trials, generator_wanted);
@@ -529,13 +511,10 @@
 		case QTYPE_SOPHIE_GERMAIN:
 			debug2("%10u: (%u) Sophie-Germain", count_in, in_type);
 			a = q;
-			if (BN_hex2bn(&a, cp) == 0)
-				fatal("BN_hex2bn failed");
+			BN_hex2bn(&a, cp);
 			/* p = 2*q + 1 */
-			if (BN_lshift(p, q, 1) == 0)
-				fatal("BN_lshift failed");
-			if (BN_add_word(p, 1) == 0)
-				fatal("BN_add_word failed");
+			BN_lshift(p, q, 1);
+			BN_add_word(p, 1);
 			in_size += 1;
 			generator_known = 0;
 			break;
@@ -546,11 +525,9 @@
 		case QTYPE_UNKNOWN:
 			debug2("%10u: (%u)", count_in, in_type);
 			a = p;
-			if (BN_hex2bn(&a, cp) == 0)
-				fatal("BN_hex2bn failed");
+			BN_hex2bn(&a, cp);
 			/* q = (p-1) / 2 */
-			if (BN_rshift(q, p, 1) == 0)
-				fatal("BN_rshift failed");
+			BN_rshift(q, p, 1);
 			break;
 		default:
 			debug2("Unknown prime type");