Update Trilead SSH-2 for Java from build 211 to build 213

1 files changed, 15 insertions, 6 deletions

diff --git a/src/com/trilead/ssh2/packets/PacketServiceAccept.java b/src/com/trilead/ssh2/packets/PacketServiceAccept.java
index f0b3c70..5081651 100644
--- a/src/com/trilead/ssh2/packets/PacketServiceAccept.java
+++ b/src/com/trilead/ssh2/packets/PacketServiceAccept.java
@@ -1,3 +1,4 @@
+

 package com.trilead.ssh2.packets;

 

 import java.io.IOException;

@@ -6,14 +7,14 @@ import java.io.IOException;
  * PacketServiceAccept.

  * 

  * @author Christian Plattner, plattner@trilead.com

- * @version $Id: PacketServiceAccept.java,v 1.1 2007/10/15 12:49:55 cplattne Exp $

+ * @version $Id: PacketServiceAccept.java,v 1.2 2008/04/01 12:38:09 cplattne Exp $

  */

 public class PacketServiceAccept

 {

 	byte[] payload;

 

 	String serviceName;

-	

+

 	public PacketServiceAccept(String serviceName)

 	{

 		this.serviceName = serviceName;

@@ -29,11 +30,19 @@ public class PacketServiceAccept
 		int packet_type = tr.readByte();

 

 		if (packet_type != Packets.SSH_MSG_SERVICE_ACCEPT)

-			throw new IOException("This is not a SSH_MSG_SERVICE_ACCEPT! ("

-					+ packet_type + ")");

+			throw new IOException("This is not a SSH_MSG_SERVICE_ACCEPT! (" + packet_type + ")");

+

+		/* Be clever in case the server is not. Some servers seem to violate RFC4253 */

+

+		if (tr.remain() > 0)

+		{

+			serviceName = tr.readString();

+		}

+		else

+		{

+			serviceName = "";

+		}

 

-		serviceName = tr.readString();

-		

 		if (tr.remain() != 0)

 			throw new IOException("Padding in SSH_MSG_SERVICE_ACCEPT packet!");

 	}