remove warnings, add some more #ifdef.
This commit is contained in:
parent
1605c4bd00
commit
db1232aea8
2 changed files with 6 additions and 4 deletions
|
@ -71,7 +71,7 @@ recvData ctx = do
|
||||||
pkt <- recvPacket ctx
|
pkt <- recvPacket ctx
|
||||||
case pkt of
|
case pkt of
|
||||||
-- on server context receiving a client hello == renegotiation
|
-- on server context receiving a client hello == renegotiation
|
||||||
Right (Handshake [ch@(ClientHello _ _ _ _ _ _ (Just _))]) ->
|
Right (Handshake [(ClientHello _ _ _ _ _ _ (Just _))]) ->
|
||||||
-- reject renegotiation with SSLv2 header
|
-- reject renegotiation with SSLv2 header
|
||||||
case roleParams $ ctxParams ctx of
|
case roleParams $ ctxParams ctx of
|
||||||
Server sparams -> error "assert, deprecated hello request in server context"
|
Server sparams -> error "assert, deprecated hello request in server context"
|
||||||
|
|
|
@ -63,16 +63,18 @@ recvRecord ctx = do
|
||||||
#endif
|
#endif
|
||||||
where recvLength header@(Header _ _ readlen)
|
where recvLength header@(Header _ _ readlen)
|
||||||
| readlen > 16384 + 2048 = return $ Left maximumSizeExceeded
|
| readlen > 16384 + 2048 = return $ Left maximumSizeExceeded
|
||||||
| otherwise = readExact ctx (fromIntegral readlen) >>= makeRecord ctx header
|
| otherwise = readExact ctx (fromIntegral readlen) >>= makeRecord header
|
||||||
|
#ifdef SSLV2_COMPATIBLE
|
||||||
recvDeprecatedLength readlen
|
recvDeprecatedLength readlen
|
||||||
| readlen > 1024 * 4 = return $ Left maximumSizeExceeded
|
| readlen > 1024 * 4 = return $ Left maximumSizeExceeded
|
||||||
| otherwise = do
|
| otherwise = do
|
||||||
content <- readExact ctx (fromIntegral readlen)
|
content <- readExact ctx (fromIntegral readlen)
|
||||||
case decodeDeprecatedHeader readlen content of
|
case decodeDeprecatedHeader readlen content of
|
||||||
Left err -> return $ Left err
|
Left err -> return $ Left err
|
||||||
Right header -> makeRecord ctx header content
|
Right header -> makeRecord header content
|
||||||
|
#endif
|
||||||
maximumSizeExceeded = Error_Protocol ("record exceeding maximum size", True, RecordOverflow)
|
maximumSizeExceeded = Error_Protocol ("record exceeding maximum size", True, RecordOverflow)
|
||||||
makeRecord ctx header content = do
|
makeRecord header content = do
|
||||||
liftIO $ (loggingIORecv $ ctxLogging ctx) header content
|
liftIO $ (loggingIORecv $ ctxLogging ctx) header content
|
||||||
usingState ctx $ disengageRecord $ rawToRecord header (fragmentCiphertext content)
|
usingState ctx $ disengageRecord $ rawToRecord header (fragmentCiphertext content)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue