yogsototh/hs-tls
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move to certificate 0.5

Browse source
This commit is contained in:
Vincent Hanquez 2011-01-02 09:49:21 +00:00
parent 4cd29853a6
commit e5e331fdf1
4 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Network/TLS/Server.hs
View file

@ -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

6
Stunnel.hs
View file

@ -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)

6
Tests/Connection.hs
View file

@ -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)

2
tls.cabal
View file

@ -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