===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/auth2-chall.c,v
retrieving revision 1.24.2.1
retrieving revision 1.25
diff -u -r1.24.2.1 -r1.25
--- src/usr.bin/ssh/auth2-chall.c	2006/10/06 03:19:32	1.24.2.1
+++ src/usr.bin/ssh/auth2-chall.c	2006/03/19 18:51:18	1.25
@@ -1,4 +1,3 @@
-/* $OpenBSD: auth2-chall.c,v 1.24.2.1 2006/10/06 03:19:32 brad Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2001 Per Allansson.  All rights reserved.
@@ -23,19 +22,13 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+#include "includes.h"
 
-#include <sys/types.h>
-
-#include <stdio.h>
-#include <string.h>
-
-#include "xmalloc.h"
 #include "ssh2.h"
-#include "key.h"
-#include "hostfile.h"
 #include "auth.h"
 #include "buffer.h"
 #include "packet.h"
+#include "xmalloc.h"
 #include "dispatch.h"
 #include "log.h"
 
@@ -267,7 +260,7 @@
 	if (nresp > 100)
 		fatal("input_userauth_info_response: too many replies");
 	if (nresp > 0) {
-		response = xcalloc(nresp, sizeof(char *));
+		response = xmalloc(nresp * sizeof(char *));
 		for (i = 0; i < nresp; i++)
 			response[i] = packet_get_string(NULL);
 	}
@@ -321,10 +314,9 @@
 {
 #ifdef BSD_AUTH
 	extern KbdintDevice mm_bsdauth_device;
-#else
+#endif
 #ifdef SKEY
 	extern KbdintDevice mm_skey_device;
-#endif
 #endif
 	/* As long as SSHv1 has devices[0] hard coded this is fine */
 #ifdef BSD_AUTH