import openssh-4.6p1-gsskex-20070312.patch

1 files changed, 13 insertions, 4 deletions

diff --git a/auth2-chall.c b/auth2-chall.c
index b147cadf3..51059c2bd 100644
--- a/auth2-chall.c
+++ b/auth2-chall.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: auth2-chall.c,v 1.32 2007/01/03 03:01:40 stevesk Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  * Copyright (c) 2001 Per Allansson.  All rights reserved.
@@ -22,14 +23,22 @@
  * (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"
-RCSID("$OpenBSD: auth2-chall.c,v 1.24 2005/07/17 07:17:54 djm Exp $");
 
+#include <sys/types.h>
+
+#include <stdarg.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"
 #include "servconf.h"
@@ -197,7 +206,7 @@ auth2_challenge_stop(Authctxt *authctxt)
 {
         /* unregister callback */
         dispatch_set(SSH2_MSG_USERAUTH_INFO_RESPONSE, NULL);
-        if (authctxt->kbdintctxt != NULL)  {
+        if (authctxt->kbdintctxt != NULL) {
                 kbdint_free(authctxt->kbdintctxt);
                 authctxt->kbdintctxt = NULL;
         }
@@ -291,7 +300,7 @@ input_userauth_info_response(int type, u_int32_t seq, void *ctxt)
         if (nresp > 100)
                 fatal("input_userauth_info_response: too many replies");
         if (nresp > 0) {
-                response = xmalloc(nresp * sizeof(char *));
+                response = xcalloc(nresp, sizeof(char *));
                 for (i = 0; i < nresp; i++)
                         response[i] = packet_get_string(NULL);
         }