From db1232aea8af2be16ba14b96dda86624595e5ab8 Mon Sep 17 00:00:00 2001
From: Vincent Hanquez <vincent@snarc.org>
Date: Mon, 3 Dec 2012 17:26:50 +0000
Subject: [PATCH] remove warnings, add some more #ifdef.

---
 core/Network/TLS/Core.hs | 2 +-
 core/Network/TLS/IO.hs   | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/Network/TLS/Core.hs b/core/Network/TLS/Core.hs
index ae2ec72..8f0a19b 100644
--- a/core/Network/TLS/Core.hs
+++ b/core/Network/TLS/Core.hs
@@ -71,7 +71,7 @@ recvData ctx = do
         pkt <- recvPacket ctx
         case pkt of
                 -- on server context receiving a client hello == renegotiation
-                Right (Handshake [ch@(ClientHello _ _ _ _ _ _ (Just _))]) ->
+                Right (Handshake [(ClientHello _ _ _ _ _ _ (Just _))]) ->
                         -- reject renegotiation with SSLv2 header
                         case roleParams $ ctxParams ctx of
                             Server sparams -> error "assert, deprecated hello request in server context"
diff --git a/core/Network/TLS/IO.hs b/core/Network/TLS/IO.hs
index efaa087..1e382e6 100644
--- a/core/Network/TLS/IO.hs
+++ b/core/Network/TLS/IO.hs
@@ -63,16 +63,18 @@ recvRecord ctx = do
 #endif
         where recvLength header@(Header _ _ readlen)
                 | 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
                 | readlen > 1024 * 4     = return $ Left maximumSizeExceeded
                 | otherwise              = do
                         content <- readExact ctx (fromIntegral readlen)
                         case decodeDeprecatedHeader readlen content of
                                 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)
-              makeRecord ctx header content = do
+              makeRecord header content = do
                         liftIO $ (loggingIORecv $ ctxLogging ctx) header content
                         usingState ctx $ disengageRecord $ rawToRecord header (fragmentCiphertext content)