andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Another workaround for 'missing algorithm' error in SSLEngine

Browse Source 
* Made handshaking non-volatile
This commit is contained in:
Trustin Lee 2008-11-16 20:34:07 +00:00
parent 87cd22b5fd
commit 580f6f2284
1 changed files with 65 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/main/java/org/jboss/netty/handler/ssl/SslHandler.java
View File

@ -124,8 +124,8 @@ public class SslHandler extends FrameDecoder {
private final boolean startTls;
final Object handshakeLock = new Object();
private volatile boolean needsFirstHandshake = true;
private volatile boolean handshaking;
private boolean initialHandshake;
private boolean handshaking;
private volatile boolean handshaken;
private volatile ChannelFuture handshakeFuture;
@ -275,6 +275,7 @@ public class SslHandler extends FrameDecoder {
return this.handshakeFuture;
} else {
engine.beginHandshake();
runDelegatedTasks();
handshakeFuture = this.handshakeFuture = newHandshakeFuture(channel);
handshaking = true;
}
@ -438,13 +439,9 @@ public class SslHandler extends FrameDecoder {
SSLEngineResult result;
try {
if (handshaking || needsFirstHandshake) {
synchronized (handshakeLock) {
result = engine.wrap(outAppBuf, outNetBuf);
}
} else {
result = engine.wrap(outAppBuf, outNetBuf);
}
} finally {
if (!outAppBuf.hasRemaining()) {
pendingUnencryptedWrites.remove();
@ -504,9 +501,7 @@ public class SslHandler extends FrameDecoder {
}
} catch (SSLException e) {
success = false;
if (handshaking) {
setHandshakeFailure(channel, e);
}
throw e;
} finally {
bufferPool.release(outNetBuf);
@ -574,13 +569,9 @@ public class SslHandler extends FrameDecoder {
SSLEngineResult result;
try {
for (;;) {
if (handshaking || needsFirstHandshake) {
synchronized (handshakeLock) {
result = engine.wrap(EMPTY_BUFFER, outNetBuf);
}
} else {
result = engine.wrap(EMPTY_BUFFER, outNetBuf);
}
if (result.bytesProduced() > 0) {
outNetBuf.flip();
@ -600,7 +591,12 @@ public class SslHandler extends FrameDecoder {
runDelegatedTasks();
break;
case NEED_UNWRAP:
if (!Thread.holdsLock(handshakeLock)) {
// unwrap shouldn't be called when this method was
// called by unwrap - unwrap will keep running after
// this method returns.
unwrap(ctx, channel, ChannelBuffers.EMPTY_BUFFER, 0, 0);
}
break;
case NOT_HANDSHAKING:
case NEED_WRAP:
@ -616,9 +612,7 @@ public class SslHandler extends FrameDecoder {
}
}
} catch (SSLException e) {
if (handshaking) {
setHandshakeFailure(channel, e);
}
throw e;
} finally {
bufferPool.release(outNetBuf);
@ -636,15 +630,21 @@ public class SslHandler extends FrameDecoder {
ByteBuffer outAppBuf = bufferPool.acquire();
try {
boolean needsWrap = false;
loop:
for (;;) {
SSLEngineResult result;
if (handshaking || needsFirstHandshake) {
synchronized (handshakeLock) {
result = engine.unwrap(inNetBuf, outAppBuf);
if (initialHandshake && !engine.getUseClientMode() &&
!engine.isInboundDone() && !engine.isOutboundDone()) {
handshake(channel);
initialHandshake = false;
}
} else {
try {
result = engine.unwrap(inNetBuf, outAppBuf);
} catch (SSLException e) {
System.err.println(engine.getUseClientMode());
throw e;
}
switch (result.getHandshakeStatus()) {
@ -662,10 +662,10 @@ public class SslHandler extends FrameDecoder {
break;
case FINISHED:
setHandshakeSuccess(channel);
wrap(ctx, channel);
needsWrap = true;
break loop;
case NOT_HANDSHAKING:
wrap(ctx, channel);
needsWrap = true;
break loop;
default:
throw new IllegalStateException(
@ -673,6 +673,11 @@ public class SslHandler extends FrameDecoder {
result.getHandshakeStatus());
}
}
}
if (needsWrap) {
wrap(ctx, channel);
}
outAppBuf.flip();
@ -684,9 +689,7 @@ public class SslHandler extends FrameDecoder {
return null;
}
} catch (SSLException e) {
if (handshaking) {
setHandshakeFailure(channel, e);
}
throw e;
} finally {
bufferPool.release(outAppBuf);
@ -694,13 +697,20 @@ public class SslHandler extends FrameDecoder {
}
private void runDelegatedTasks() {
Runnable task;
while ((task = engine.getDelegatedTask()) != null) {
final Runnable t = task;
for (;;) {
final Runnable task;
synchronized (handshakeLock) {
task = engine.getDelegatedTask();
}
if (task == null) {
break;
}
delegatedTaskExecutor.execute(new Runnable() {
public void run() {
synchronized (handshakeLock) {
t.run();
task.run();
}
}
});
@ -711,7 +721,6 @@ public class SslHandler extends FrameDecoder {
synchronized (handshakeLock) {
handshaking = false;
handshaken = true;
needsFirstHandshake = false; // Will not set to true again
if (handshakeFuture == null) {
handshakeFuture = newHandshakeFuture(channel);
@ -723,6 +732,9 @@ public class SslHandler extends FrameDecoder {
private void setHandshakeFailure(Channel channel, SSLException cause) {
synchronized (handshakeLock) {
if (!handshaking) {
return;
}
handshaking = false;
handshaken = false;