From e5e331fdf1f467363e98a099491b997c0362f4ab Mon Sep 17 00:00:00 2001
From: Vincent Hanquez <vincent@snarc.org>
Date: Sun, 2 Jan 2011 09:49:21 +0000
Subject: [PATCH] move to certificate 0.5

---
 Network/TLS/Server.hs | 23 ++++++++++++-----------
 Stunnel.hs            |  6 +++---
 Tests/Connection.hs   |  6 +++---
 tls.cabal             |  2 +-
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/Network/TLS/Server.hs b/Network/TLS/Server.hs
index 817f12e..860804e 100644
--- a/Network/TLS/Server.hs
+++ b/Network/TLS/Server.hs
@@ -32,7 +32,8 @@ import Control.Monad.Trans
 import Control.Monad.State
 import Control.Applicative ((<$>))
 import Data.Certificate.X509
-import qualified Data.Certificate.Key as CertificateKey
+import qualified Data.Certificate.KeyRSA as KeyRSA
+import qualified Data.Certificate.KeyDSA as KeyDSA
 import Network.TLS.Cipher
 import Network.TLS.Crypto
 import Network.TLS.Struct
@@ -46,7 +47,7 @@ import qualified Data.ByteString.Lazy as L
 import System.IO (Handle, hFlush)
 import qualified Crypto.Cipher.RSA as RSA
 
-type TLSServerCert = (B.ByteString, Certificate, CertificateKey.PrivateKey)
+type TLSServerCert = (B.ByteString, Certificate, KeyRSA.Private)
 
 data TLSServerCallbacks = TLSServerCallbacks
 	{ cbCertificates :: Maybe ([Certificate] -> IO Bool) -- ^ optional callback to verify certificates
@@ -55,7 +56,7 @@ data TLSServerCallbacks = TLSServerCallbacks
 instance Show TLSServerCallbacks where
 	show _ = "[callbacks]"
 
-instance Show CertificateKey.PrivateKey where
+instance Show KeyRSA.Private where
 	show _ = "[privatekey]"
 
 data TLSServerParams = TLSServerParams
@@ -150,14 +151,14 @@ handshakeSendServerData handle = do
 	let needkeyxchg = cipherExchangeNeedMoreData $ cipherKeyExchange cipher
 
 	let privkey = PrivRSA $ RSA.PrivateKey
-		{ RSA.private_sz   = fromIntegral $ CertificateKey.privKey_lenmodulus privkeycert
-		, RSA.private_n    = CertificateKey.privKey_modulus privkeycert
-		, RSA.private_d    = CertificateKey.privKey_private_exponant privkeycert
-		, RSA.private_p    = CertificateKey.privKey_p1 privkeycert
-		, RSA.private_q    = CertificateKey.privKey_p2 privkeycert
-		, RSA.private_dP   = CertificateKey.privKey_exp1 privkeycert
-		, RSA.private_dQ   = CertificateKey.privKey_exp2 privkeycert
-		, RSA.private_qinv = CertificateKey.privKey_coef privkeycert
+		{ RSA.private_sz   = fromIntegral $ KeyRSA.lenmodulus privkeycert
+		, RSA.private_n    = KeyRSA.modulus privkeycert
+		, RSA.private_d    = KeyRSA.private_exponant privkeycert
+		, RSA.private_p    = KeyRSA.p1 privkeycert
+		, RSA.private_q    = KeyRSA.p2 privkeycert
+		, RSA.private_dP   = KeyRSA.exp1 privkeycert
+		, RSA.private_dQ   = KeyRSA.exp2 privkeycert
+		, RSA.private_qinv = KeyRSA.coef privkeycert
 		}
 	setPrivateKey privkey
 
diff --git a/Stunnel.hs b/Stunnel.hs
index 37e8cb4..5700422 100644
--- a/Stunnel.hs
+++ b/Stunnel.hs
@@ -17,7 +17,7 @@ import Data.Char (isDigit)
 
 import Data.Certificate.PEM
 import Data.Certificate.X509
-import Data.Certificate.Key
+import qualified Data.Certificate.KeyRSA as KeyRSA
 
 import Network.TLS.Cipher
 import Network.TLS.SRandom
@@ -106,13 +106,13 @@ readCertificate filepath = do
 		Right x  -> x
 	return (certdata, cert)
 
-readPrivateKey :: FilePath -> IO (L.ByteString, PrivateKey)
+readPrivateKey :: FilePath -> IO (L.ByteString, KeyRSA.Private)
 readPrivateKey filepath = do
 	content <- B.readFile filepath
 	let pkdata = case parsePEMKeyRSA content of
 		Nothing -> error ("no valid RSA key section")
 		Just x  -> L.fromChunks [x]
-	let pk = case decodePrivateKey pkdata of
+	let pk = case KeyRSA.decodePrivate pkdata of
 		Left err -> error ("cannot decode key: " ++ err)
 		Right x  -> x
 	return (pkdata, pk)
diff --git a/Tests/Connection.hs b/Tests/Connection.hs
index 43510c4..7fb38d7 100644
--- a/Tests/Connection.hs
+++ b/Tests/Connection.hs
@@ -20,7 +20,7 @@ import qualified Data.ByteString.Lazy as L
 
 import Data.Certificate.PEM
 import Data.Certificate.X509
-import Data.Certificate.Key
+import qualified Data.Certificate.KeyRSA as KeyRSA
 import qualified Network.TLS.Client as C
 import qualified Network.TLS.Server as S
 import Network.TLS.Cipher
@@ -59,13 +59,13 @@ readCertificate filepath = do
 		Right x  -> x
 	return (certdata, cert)
 
-readPrivateKey :: FilePath -> IO (L.ByteString, PrivateKey)
+readPrivateKey :: FilePath -> IO (L.ByteString, KeyRSA.Private)
 readPrivateKey filepath = do
 	content <- B.readFile filepath
 	let pkdata = case parsePEMKeyRSA content of
 		Nothing -> error ("no valid RSA key section")
 		Just x  -> L.fromChunks [x]
-	let pk = case decodePrivateKey pkdata of
+	let pk = case KeyRSA.decodePrivate pkdata of
 		Left err -> error ("cannot decode key: " ++ err)
 		Right x  -> x
 	return (pkdata, pk)
diff --git a/tls.cabal b/tls.cabal
index 7cdc83e..b9bd1ac 100644
--- a/tls.cabal
+++ b/tls.cabal
@@ -40,7 +40,7 @@ Library
                      AES,
                      crypto-api >= 0.2,
                      cryptocipher >= 0.2,
-                     certificate >= 0.4 && < 0.5
+                     certificate >= 0.5 && < 0.6
   Exposed-modules:   Network.TLS.Client
                      Network.TLS.Server
                      Network.TLS.Struct