===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/moduli.c,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- src/usr.bin/ssh/moduli.c	2005/07/17 07:17:55	1.12
+++ src/usr.bin/ssh/moduli.c	2006/10/06 03:19:32	1.12.2.1
@@ -1,4 +1,4 @@
-/* $OpenBSD: moduli.c,v 1.12 2005/07/17 07:17:55 djm Exp $ */
+/* $OpenBSD: moduli.c,v 1.12.2.1 2006/10/06 03:19:32 brad Exp $ */
 /*
  * Copyright 1994 Phil Karn <karn@qualcomm.com>
  * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com>
@@ -37,12 +37,19 @@
  * Second step: test primes' safety (processor intensive)
  */
 
-#include "includes.h"
-#include "xmalloc.h"
-#include "log.h"
+#include <sys/types.h>
 
 #include <openssl/bn.h>
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+#include <time.h>
+
+#include "xmalloc.h"
+#include "log.h"
+
 /*
  * File output defines
  */
@@ -301,21 +308,10 @@
 		largewords = (largememory << SHIFT_MEGAWORD);
 	}
 
-	TinySieve = calloc(tinywords, sizeof(u_int32_t));
-	if (TinySieve == NULL) {
-		error("Insufficient memory for tiny sieve: need %u bytes",
-		    tinywords << SHIFT_BYTE);
-		exit(1);
-	}
+	TinySieve = xcalloc(tinywords, sizeof(u_int32_t));
 	tinybits = tinywords << SHIFT_WORD;
 
-	SmallSieve = calloc(smallwords, sizeof(u_int32_t));
-	if (SmallSieve == NULL) {
-		error("Insufficient memory for small sieve: need %u bytes",
-		    smallwords << SHIFT_BYTE);
-		xfree(TinySieve);
-		exit(1);
-	}
+	SmallSieve = xcalloc(smallwords, sizeof(u_int32_t));
 	smallbits = smallwords << SHIFT_WORD;
 
 	/*