From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-208336-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1NLaQm-0006tx-Qg
	for garchives@archives.gentoo.org; Fri, 18 Dec 2009 10:51:33 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 728D9E0963;
	Fri, 18 Dec 2009 10:51:31 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 36C3AE0963
	for <gentoo-commits@lists.gentoo.org>; Fri, 18 Dec 2009 10:51:31 +0000 (UTC)
Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTP id D28C667B9C
	for <gentoo-commits@lists.gentoo.org>; Fri, 18 Dec 2009 10:51:30 +0000 (UTC)
Received: from pva by stork.gentoo.org with local (Exim 4.69)
	(envelope-from <pva@gentoo.org>)
	id 1NLaQk-0006XN-C8
	for gentoo-commits@lists.gentoo.org; Fri, 18 Dec 2009 10:51:30 +0000
From: "Peter Volkov (pva)" <pva@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Reply-To: gentoo-dev@lists.gentoo.org, pva@gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/hydra/files: hydra-5.4-libssh-0.4.0.patch
X-VCS-Repository: gentoo-x86
X-VCS-Files: hydra-5.4-libssh-0.4.0.patch
X-VCS-Directories: net-analyzer/hydra/files
X-VCS-Committer: pva
X-VCS-Committer-Name: Peter Volkov
Content-Type: text/plain; charset=utf8
Message-Id: <E1NLaQk-0006XN-C8@stork.gentoo.org>
Sender: Peter Volkov <pva@stork.gentoo.org>
Date: Fri, 18 Dec 2009 10:51:30 +0000
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 929343e0-8117-45c0-9681-072e1f4100f4
X-Archives-Hash: 723454db18974dca4e3b2c89d583db4e

pva         09/12/18 10:51:30

  Added:                hydra-5.4-libssh-0.4.0.patch
  Log:
  Fixed compatibility issue with libssh-0.4, bug #296816, thank Willard D=
awson for report and Jonathan-Christofer Demay for ideas.
  (Portage version: 2.1.7.15/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  net-analyzer/hydra/files/hydra-5.4-libssh-0.4.0.patc=
h

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/hydra=
/files/hydra-5.4-libssh-0.4.0.patch?rev=3D1.1&view=3Dmarkup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-analyzer/hydra=
/files/hydra-5.4-libssh-0.4.0.patch?rev=3D1.1&content-type=3Dtext/plain

Index: hydra-5.4-libssh-0.4.0.patch
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
http://bugs.gentoo.org/show_bug.cgi?id=3D296816

Author: Peter Volkov <pva@gentoo.org> with some ideas from Jonathan-Chris=
tofer Demay.

=3D=3D=3D modified file 'configure'
--- configure	2009-12-15 08:46:59 +0000
+++ configure	2009-12-17 08:26:59 +0000
@@ -243,11 +243,11 @@
=20
 if [ -n "$SSH_PATH" ]; then
     echo "                                      ... found"
-    echo 'NOTE: ensure that you have libssh v0.11 installed!! Get it fro=
m http://0xbadc0de.be !'
+    echo 'NOTE: ensure that you have libssh v0.4 or later installed!! Ge=
t it from http://www.libssh.org !'
 fi
 if [ "X" =3D "X$SSH_PATH" ]; then
     echo "                                      ... NOT found, module ss=
h2 disabled"
-    echo 'Get it from http://0xbadc0de.be/ - use v0.11!'
+    echo 'Get it from http://www.libssh.org/ - use v0.4!'
 fi
 if [ "$SSH_IPATH" =3D "/usr/include" ]; then
     SSH_IPATH=3D""

=3D=3D=3D modified file 'hydra-ssh2.c'
--- hydra-ssh2.c	2009-12-15 08:46:59 +0000
+++ hydra-ssh2.c	2009-12-18 10:21:52 +0000
@@ -7,31 +7,70 @@
 }
 #else
=20
-#warning "If compilation of hydra-ssh2 fails, you are not using v0.11. D=
ownload from http://www.0xbadc0de.be/"
-
 #include <libssh/libssh.h>
=20
 extern char *HYDRA_EXIT;
=20
+/* try to authenticate with one password */
+static int
+try_password(ssh_session ssh_session, const char *login, const char *pas=
sword){
+  int auth_state;
+  int i, j, n;
+  int methods;
+
+#ifdef DEBUG_SSH2
+  printf("[DEBUG] try_password(): trying login =3D \"%s\", pass \"%s\"\n=
", login, password);
+#endif
+
+  methods =3D ssh_auth_list(ssh_session);
+  if (methods & SSH_AUTH_METHOD_INTERACTIVE) {
+#ifdef DEBUG_SSH2
+    printf("[DEBUG] try_password(): trying keyboard interactive method\n=
");
+#endif
+    auth_state =3D ssh_userauth_kbdint(ssh_session, login, NULL);
+    /* For safety we'll limit number of prompts to 33 */
+    for(j=3D0; auth_state =3D=3D SSH_AUTH_INFO && j<33; j++) {
+      n=3Dssh_userauth_kbdint_getnprompts(ssh_session);
+      for(i=3D0; i<n; ++i) {
+        ssh_userauth_kbdint_setanswer(ssh_session, i, password);
+      }
+      auth_state =3D ssh_userauth_kbdint(ssh_session, login, NULL);
+    }
+    /* Password is valid but an other authentication token is needed */
+    if(auth_state =3D=3D SSH_AUTH_PARTIAL=20
+        || auth_state =3D=3D SSH_AUTH_SUCCESS)
+        return SSH_AUTH_SUCCESS;
+  }
+
+  if (methods & SSH_AUTH_METHOD_PASSWORD) {
+#ifdef DEBUG_SSH2
+    printf("[DEBUG] try_password(): trying password method\n");
+#endif
+    auth_state =3D ssh_userauth_password(ssh_session, login, password);
+    if(auth_state =3D=3D SSH_AUTH_PARTIAL
+        || auth_state =3D=3D SSH_AUTH_SUCCESS)
+      return SSH_AUTH_SUCCESS;
+  }
+  return auth_state;
+}
+
+
 int
-start_ssh2(int s, unsigned long int ip, int port, unsigned char options,=
 char *miscptr, FILE * fp)
+start_ssh2(int s, unsigned long int ip, int port, unsigned char options,=
 char *miscptr, FILE * fp, char *libssh_error)
 {
   char *empty =3D "";
-  char *login, *pass;
+  char *login, *pass, prev_login[260];
   char *buf;
-  char *rc;
   struct sockaddr_in targetip;
-  SSH_SESSION *ssh_session;
-  SSH_OPTIONS *ssh_opt;
+  ssh_session ssh_session =3D ssh_new();
   int auth_state;
-  int i =3D 0;
=20
   if (strlen(login =3D hydra_get_next_login()) =3D=3D 0)
     login =3D empty;
+  strcpy(prev_login, login);
   if (strlen(pass =3D hydra_get_next_password()) =3D=3D 0)
     pass =3D empty;
=20
-  ssh_opt=3Doptions_new();
   memset(&targetip, 0, sizeof(targetip));
   memcpy(&targetip.sin_addr.s_addr, &ip, 4);
   targetip.sin_family =3D AF_INET;
@@ -41,62 +80,79 @@
   buf =3D malloc(20);
   inet_ntop(AF_INET, &targetip.sin_addr, buf, 20);
 #endif
-  options_set_wanted_method(ssh_opt,KEX_COMP_C_S,"none");
-  options_set_wanted_method(ssh_opt,KEX_COMP_S_C,"none");
-  options_set_port(ssh_opt, port);
-  options_set_host(ssh_opt, buf);
-  options_set_username(ssh_opt, login);
-
-  if ((ssh_session =3D ssh_connect(ssh_opt)) =3D=3D NULL) {
-    rc =3D ssh_get_error(ssh_session);
-    if ((rc !=3D NULL) && (rc[0] !=3D '\0')) {
-      if (strncmp("connect:", ssh_get_error(ssh_session), strlen("connec=
t:")) =3D=3D 0)
-        return 3;
-      else
-        return 4;
-    }
+
+#ifdef DEBUG_SSH2
+  printf("[DEBUG] ssh_options_set host=3D%s:%d, login=3D%s.\n", buf, por=
t, login);
+#endif
+  ssh_options_set(ssh_session, SSH_OPTIONS_HOST, buf);
+  ssh_options_set(ssh_session, SSH_OPTIONS_PORT, &port);
+  ssh_options_set(ssh_session, SSH_OPTIONS_USER, login);
+  ssh_options_set(ssh_session, SSH_OPTIONS_COMPRESSION_C_S, "none");
+  ssh_options_set(ssh_session, SSH_OPTIONS_COMPRESSION_S_C, "none");
+
+  if ( ssh_connect(ssh_session) !=3D SSH_OK ) {
+#ifdef DEBUG_SSH2
+    printf("[DEBUG] ssh_connect(ssh_session) !=3D SSH_OK\n");
+#endif
+    strcpy(libssh_error,ssh_get_error(ssh_session));
+    ssh_disconnect(ssh_session);
+    return 3;
   }
 #ifndef CYGWIN
   free(buf);
   buf =3D NULL;
 #endif
=20
+  /* Try 'none' method for passwordless servers */
+  auth_state =3D ssh_userauth_none(ssh_session, login);
+#ifdef DEBUG_SSH2
+  printf("[DEBUG] ssh_userauth_none (0) state =3D %d\n", auth_state);
+#endif
   do {
-    /* why this crap? */
-    auth_state =3D ssh_userauth_kbdint(ssh_session, login, NULL);
-    while (i < 10 && auth_state =3D=3D SSH_AUTH_INFO) {
-      ssh_userauth_kbdint_setanswer(ssh_session, i, pass);
-      auth_state =3D ssh_userauth_kbdint(ssh_session, login, NULL);
-      i++;
-    }
-   =20
-    if (auth_state =3D=3D SSH_AUTH_SUCCESS || ssh_userauth_password(ssh_=
session, login, pass) =3D=3D SSH_AUTH_SUCCESS) {
-      ssh_disconnect(ssh_session);	/* this automagically frees the ssh_o=
pt buffer */
+    if (auth_state !=3D SSH_AUTH_SUCCESS)
+      auth_state =3D try_password(ssh_session, login, pass);
+#ifdef DEBUG_SSH2
+    printf("[DEBUG] try_password returned auth_state =3D %d\n", auth_sta=
te);
+#endif
+    if (auth_state =3D=3D SSH_AUTH_SUCCESS) {
+      ssh_disconnect(ssh_session);
       hydra_report_found_host(port, ip, "ssh2", fp);
       hydra_completed_pair_found();
       if (memcmp(hydra_get_next_pair(), &HYDRA_EXIT, sizeof(HYDRA_EXIT))=
 =3D=3D 0)
         return 2;
-      /* free(ssh_opt); */ /* DOUBLE FREE ! */
       return 1;
+    }=20
+    if (auth_state =3D=3D SSH_AUTH_DENIED) {
+      hydra_completed_pair();
+      if (memcmp(hydra_get_next_pair(), &HYDRA_EXIT, sizeof(HYDRA_EXIT))=
 =3D=3D 0) {
+        ssh_disconnect(ssh_session);
+        return 2;
+      }
+      if (strlen(login =3D hydra_get_next_login()) =3D=3D 0)
+        login =3D empty;
+
+      if(strcmp(login,prev_login) !=3D 0) {
+        ssh_disconnect(ssh_session);=20
+#ifdef DEBUG_SSH2
+        printf("[DEBUG] new login (%s): we have to restart ssh sessionte=
\n", login);
+#endif
+        return 1;
+      }
+      if (strlen(pass =3D hydra_get_next_password()) =3D=3D 0)
+        pass =3D empty;
     } else {
-      if (ssh_error_code(ssh_session) =3D=3D 1) {
-        hydra_completed_pair();
-        if (memcmp(hydra_get_next_pair(), &HYDRA_EXIT, sizeof(HYDRA_EXIT=
)) =3D=3D 0)
-          return 2;
-      } else {
-        ssh_disconnect(ssh_session);	/* this automagically frees the ssh=
_opt buffer */
-        hydra_completed_pair(); /* really? */
-        if (memcmp(hydra_get_next_pair(), &HYDRA_EXIT, sizeof(HYDRA_EXIT=
)) =3D=3D 0)
-          return 2;
-        /* free(ssh_opt); */ /* DOUBLE FREE ! */
-        return 1;
-      }
+#ifdef DEBUG_SSH2
+        printf("[DEBUG] ssh session problem (%d)\n", auth_state);
+#endif
+       hydra_completed_pair(); /* really? */
+       ssh_disconnect(ssh_session);=20
+       if (memcmp(hydra_get_next_pair(), &HYDRA_EXIT, sizeof(HYDRA_EXIT)=
) =3D=3D 0)
+         return 2;
+       return 1;
     }
   } while(1);
=20
   /* not reached */
-
-  /* free(ssh_opt); */ /* risk of double free */
   return 1;
 }
=20
@@ -104,6 +160,7 @@
 service_ssh2(unsigned long int ip, int sp, unsigned char options, char *=
miscptr, FILE * fp, int port)
 {
   int run =3D 1, next_run =3D 1, sock =3D -1;
+  char libssh_error[1024]; /* check ERROR_BUFFERLEN in libssh */
=20
   hydra_register_socket(sp);
   if (memcmp(hydra_get_next_pair(), &HYDRA_EXIT, sizeof(HYDRA_EXIT)) =3D=
=3D 0)
@@ -111,16 +168,15 @@
   while (1) {
     switch (run) {
     case 1:                    /* connect and service init function */
-      next_run =3D start_ssh2(sock, ip, port, options, miscptr, fp);
+      next_run =3D start_ssh2(sock, ip, port, options, miscptr, fp, libs=
sh_error);
       break;
     case 2:
       hydra_child_exit(0);
+      break;
     case 3:                    /* clean exit */
-      fprintf(stderr, "Error: could not connect to target port %d\n", po=
rt);
+      fprintf(stderr, "ssh_connect failed: %s\n", libssh_error);
       hydra_child_exit(1);
-    case 4:
-      fprintf(stderr, "Error: ssh2 protocol error\n");
-      hydra_child_exit(2);
+      break;
     default:
       hydra_report(stderr, "Caught unknown return code, exiting!\n");
       hydra_child_exit(-1);