Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

454773 - SSLConnection use on Android client results in loop 

+ Adding safety check for SSL unwrap in client mode that
  results in OK status but no content
This commit is contained in:
Joakim Erdfelt 2014-12-12 09:23:24 -07:00
parent fe444b28dd
commit 2b241ac04b
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
View File

@ -304,7 +304,7 @@ public class SslConnection extends AbstractConnection
{
@Override
public void succeeded()
{
{
}
@Override
@ -314,7 +314,7 @@ public class SslConnection extends AbstractConnection
getFillInterest().onFail(x);
getWriteFlusher().onFail(x);
}
},x);
}
};
@ -346,7 +346,7 @@ public class SslConnection extends AbstractConnection
@Override
protected void onIncompleteFlush()
{
{
// This means that the decrypted endpoint write method was called and not
// all data could be wrapped. So either we need to write some encrypted data,
// OR if we are handshaking we need to read some encrypted data OR
@ -380,8 +380,8 @@ public class SslConnection extends AbstractConnection
try_again = true;
}
}
if (try_again)
{
// If the output is closed,
@ -522,7 +522,9 @@ public class SslConnection extends AbstractConnection
HandshakeStatus unwrapHandshakeStatus = unwrapResult.getHandshakeStatus();
Status unwrapResultStatus = unwrapResult.getStatus();
_underFlown = unwrapResultStatus == Status.BUFFER_UNDERFLOW;
// Extra check on unwrapResultStatus == OK with zero length buffer is due
// to SSL client on android (see bug #454773)
_underFlown = unwrapResultStatus == Status.BUFFER_UNDERFLOW || unwrapResultStatus == Status.OK && unwrapResult.bytesConsumed()==0 && unwrapResult.bytesProduced()==0;
if (_underFlown)
{
@ -731,11 +733,11 @@ public class SslConnection extends AbstractConnection
if (wrapResult.bytesConsumed()>0)
consumed+=wrapResult.bytesConsumed();
Status wrapResultStatus = wrapResult.getStatus();
boolean allConsumed=true;
for (ByteBuffer b : appOuts)
if (BufferUtil.hasContent(b))
allConsumed=false;
allConsumed=false;
// and deal with the results returned from the sslEngineWrap
switch (wrapResultStatus)
@ -800,7 +802,7 @@ public class SslConnection extends AbstractConnection
// try again.
if (!allConsumed && wrapResult.getHandshakeStatus()==HandshakeStatus.FINISHED && BufferUtil.isEmpty(_encryptedOutput))
continue;
// Return true if we consumed all the bytes and encrypted are all flushed
return allConsumed && BufferUtil.isEmpty(_encryptedOutput);