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

NETTY-394 SslHandler does not work with a little endian buffer

Browse Source 
Added SslHandler.getShort() which replaces ChannelBuffer.getShort() calls
This commit is contained in:
Trustin Lee 2011-04-02 03:27:00 +09:00
parent 6f7e2606a1
commit 16750ffc28
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -524,7 +524,7 @@ public class SslHandler extends FrameDecoder
int majorVersion = buffer.getUnsignedByte(buffer.readerIndex() + 1); int majorVersion = buffer.getUnsignedByte(buffer.readerIndex() + 1);
if (majorVersion >= 3 && majorVersion < 10) { if (majorVersion >= 3 && majorVersion < 10) {
// SSLv3 or TLS // SSLv3 or TLS
packetLength = (buffer.getShort(buffer.readerIndex() + 3) & 0xFFFF) + 5; packetLength = (getShort(buffer, buffer.readerIndex() + 3) & 0xFFFF) + 5;
if (packetLength <= 5) { if (packetLength <= 5) {
// Neither SSLv2 or TLSv1 (i.e. SSLv2 or bad data) // Neither SSLv2 or TLSv1 (i.e. SSLv2 or bad data)
tls = false; tls = false;
@ -545,9 +545,9 @@ public class SslHandler extends FrameDecoder
if (majorVersion >= 2 && majorVersion < 10) { if (majorVersion >= 2 && majorVersion < 10) {
// SSLv2 // SSLv2
if (headerLength == 2) { if (headerLength == 2) {
packetLength = (buffer.getShort(buffer.readerIndex()) & 0x7FFF) + 2; packetLength = (getShort(buffer, buffer.readerIndex()) & 0x7FFF) + 2;
} else { } else {
packetLength = (buffer.getShort(buffer.readerIndex()) & 0x3FFF) + 3; packetLength = (getShort(buffer, buffer.readerIndex()) & 0x3FFF) + 3;
} }
if (packetLength <= headerLength) { if (packetLength <= headerLength) {
sslv2 = false; sslv2 = false;
@ -590,6 +590,14 @@ public class SslHandler extends FrameDecoder
return unwrap(ctx, channel, buffer, packetOffset, packetLength); return unwrap(ctx, channel, buffer, packetOffset, packetLength);
} }
/**
* Reads a big-endian short integer from the buffer. Please note that we do not use
* {@link ChannelBuffer#getShort(int)} because it might be a little-endian buffer.
*/
private static short getShort(ChannelBuffer buf, int offset) {
return (short) (buf.getByte(offset) << 8 | buf.getByte(offset + 1) & 0xFF);
}
private ChannelFuture wrap(ChannelHandlerContext context, Channel channel) private ChannelFuture wrap(ChannelHandlerContext context, Channel channel)
throws SSLException { throws SSLException {