diff --git a/peyotls.cabal b/peyotls.cabal --- a/peyotls.cabal +++ b/peyotls.cabal @@ -2,7 +2,7 @@ cabal-version: >= 1.8 name: peyotls -version: 0.0.0.0 +version: 0.0.0.1 stability: Experimental author: Yoshikuni Jujo maintainer: Yoshikuni Jujo @@ -272,7 +272,7 @@ source-repository this type: git location: git://github.com/YoshikuniJujo/peyotls.git - tag: peyotls-0.0.0.0 + tag: peyotls-0.0.0.1 library hs-source-dirs: src @@ -297,7 +297,7 @@ cryptohash == 0.11.*, crypto-pubkey == 0.2.*, crypto-pubkey-types == 0.4.*, cipher-aes == 0.2.*, - bytable == 0.0.0.*, handle-like == 0.0.0.* + bytable == 0.1.*, handle-like == 0.0.0.* ghc-options: -Wall extensions: PatternGuards, DoAndIfThenElse diff --git a/src/Network/PeyoTLS/Certificate.hs b/src/Network/PeyoTLS/Certificate.hs --- a/src/Network/PeyoTLS/Certificate.hs +++ b/src/Network/PeyoTLS/Certificate.hs @@ -15,7 +15,7 @@ import qualified Data.ASN1.BinaryEncoding as ASN1 import qualified Data.X509 as X509 import qualified Data.X509.CertificateStore as X509 -import qualified Codec.Bytable as B +import qualified Codec.Bytable.BigEndian as B import Network.PeyoTLS.HashSignAlgorithm (HashAlg, SignAlg) diff --git a/src/Network/PeyoTLS/CipherSuite.hs b/src/Network/PeyoTLS/CipherSuite.hs --- a/src/Network/PeyoTLS/CipherSuite.hs +++ b/src/Network/PeyoTLS/CipherSuite.hs @@ -8,7 +8,7 @@ import Data.String (IsString(..)) import qualified Data.ByteString as BS -import qualified Codec.Bytable as B +import qualified Codec.Bytable.BigEndian as B data CipherSuite = CipherSuite KeyExchange BulkEncryption diff --git a/src/Network/PeyoTLS/Client.hs b/src/Network/PeyoTLS/Client.hs --- a/src/Network/PeyoTLS/Client.hs +++ b/src/Network/PeyoTLS/Client.hs @@ -21,7 +21,7 @@ import qualified Data.ASN1.BinaryEncoding as ASN1 import qualified Data.X509 as X509 import qualified Data.X509.CertificateStore as X509 -import qualified Codec.Bytable as B +import qualified Codec.Bytable.BigEndian as B import qualified Crypto.Hash.SHA1 as SHA1 import qualified Crypto.Hash.SHA256 as SHA256 import qualified Crypto.PubKey.DH as DH diff --git a/src/Network/PeyoTLS/CryptoTools.hs b/src/Network/PeyoTLS/CryptoTools.hs --- a/src/Network/PeyoTLS/CryptoTools.hs +++ b/src/Network/PeyoTLS/CryptoTools.hs @@ -17,8 +17,7 @@ import qualified Crypto.Hash.SHA256 as SHA256 import qualified Crypto.Cipher.AES as AES -import qualified Codec.Bytable as B -import Codec.Bytable.BigEndian () +import qualified Codec.Bytable.BigEndian as B makeKeys :: Int -> BS.ByteString -> BS.ByteString -> BS.ByteString -> (BS.ByteString, BS.ByteString, BS.ByteString, BS.ByteString, BS.ByteString) diff --git a/src/Network/PeyoTLS/Ecdsa.hs b/src/Network/PeyoTLS/Ecdsa.hs --- a/src/Network/PeyoTLS/Ecdsa.hs +++ b/src/Network/PeyoTLS/Ecdsa.hs @@ -9,8 +9,7 @@ import Crypto.Number.ModArithmetic (inverse) import qualified Data.ByteString as BS -import qualified Codec.Bytable as B -import Codec.Bytable.BigEndian () +import qualified Codec.Bytable.BigEndian as B import qualified Crypto.Types.PubKey.ECC as ECC import qualified Crypto.PubKey.ECC.Prim as ECC import qualified Crypto.PubKey.ECC.ECDSA as ECDSA diff --git a/src/Network/PeyoTLS/Extension.hs b/src/Network/PeyoTLS/Extension.hs --- a/src/Network/PeyoTLS/Extension.hs +++ b/src/Network/PeyoTLS/Extension.hs @@ -8,7 +8,7 @@ import Data.Word (Word8, Word16) import qualified Data.ByteString as BS -import qualified Codec.Bytable as B +import qualified Codec.Bytable.BigEndian as B import qualified Crypto.Types.PubKey.DH as DH import qualified Crypto.Types.PubKey.ECC as ECC diff --git a/src/Network/PeyoTLS/HandshakeBase.hs b/src/Network/PeyoTLS/HandshakeBase.hs --- a/src/Network/PeyoTLS/HandshakeBase.hs +++ b/src/Network/PeyoTLS/HandshakeBase.hs @@ -40,7 +40,7 @@ import qualified Data.ASN1.Types as ASN1 import qualified Data.ASN1.Encoding as ASN1 import qualified Data.ASN1.BinaryEncoding as ASN1 -import qualified Codec.Bytable as B +import qualified Codec.Bytable.BigEndian as B import qualified Crypto.Hash.SHA1 as SHA1 import qualified Crypto.Hash.SHA256 as SHA256 import qualified Crypto.PubKey.RSA as RSA diff --git a/src/Network/PeyoTLS/HandshakeType.hs b/src/Network/PeyoTLS/HandshakeType.hs --- a/src/Network/PeyoTLS/HandshakeType.hs +++ b/src/Network/PeyoTLS/HandshakeType.hs @@ -18,7 +18,7 @@ import qualified Data.ByteString as BS import qualified Data.X509 as X509 -import qualified Codec.Bytable as B +import qualified Codec.Bytable.BigEndian as B import qualified Crypto.PubKey.DH as DH import qualified Crypto.Types.PubKey.ECC as ECC diff --git a/src/Network/PeyoTLS/HashSignAlgorithm.hs b/src/Network/PeyoTLS/HashSignAlgorithm.hs --- a/src/Network/PeyoTLS/HashSignAlgorithm.hs +++ b/src/Network/PeyoTLS/HashSignAlgorithm.hs @@ -5,8 +5,7 @@ import Data.Word (Word8) import qualified Data.ByteString as BS -import qualified Codec.Bytable as B -import Codec.Bytable.BigEndian () +import qualified Codec.Bytable.BigEndian as B data HashAlg = Sha1 | Sha224 | Sha256 | Sha384 | Sha512 | HARaw Word8 deriving Show diff --git a/src/Network/PeyoTLS/Hello.hs b/src/Network/PeyoTLS/Hello.hs --- a/src/Network/PeyoTLS/Hello.hs +++ b/src/Network/PeyoTLS/Hello.hs @@ -11,7 +11,7 @@ import Numeric (showHex) import qualified Data.ByteString as BS -import qualified Codec.Bytable as B +import qualified Codec.Bytable.BigEndian as B import Network.PeyoTLS.Extension (Extension, SignAlg(..), HashAlg(..)) import Network.PeyoTLS.CipherSuite ( diff --git a/src/Network/PeyoTLS/ReadFile.hs b/src/Network/PeyoTLS/ReadFile.hs --- a/src/Network/PeyoTLS/ReadFile.hs +++ b/src/Network/PeyoTLS/ReadFile.hs @@ -16,7 +16,7 @@ import qualified Data.X509 as X509 import qualified Data.X509.File as X509 import qualified Data.X509.CertificateStore as X509 -import qualified Codec.Bytable as B +import qualified Codec.Bytable.BigEndian as B import Codec.Bytable.BigEndian () import qualified Crypto.PubKey.ECC.Prim as ECC import qualified Crypto.Types.PubKey.ECC as ECC diff --git a/src/Network/PeyoTLS/Server.hs b/src/Network/PeyoTLS/Server.hs --- a/src/Network/PeyoTLS/Server.hs +++ b/src/Network/PeyoTLS/Server.hs @@ -22,7 +22,7 @@ import qualified Data.X509 as X509 import qualified Data.X509.Validation as X509 import qualified Data.X509.CertificateStore as X509 -import qualified Codec.Bytable as B +import qualified Codec.Bytable.BigEndian as B import qualified Crypto.PubKey.RSA as RSA import qualified Crypto.PubKey.RSA.Prim as RSA import qualified Crypto.Types.PubKey.ECC as ECC diff --git a/src/Network/PeyoTLS/State.hs b/src/Network/PeyoTLS/State.hs --- a/src/Network/PeyoTLS/State.hs +++ b/src/Network/PeyoTLS/State.hs @@ -15,7 +15,7 @@ import Data.String (IsString(..)) import qualified Data.ByteString as BS -import qualified Codec.Bytable as B +import qualified Codec.Bytable.BigEndian as B import Network.PeyoTLS.CipherSuite ( CipherSuite(..), KeyExchange(..), BulkEncryption(..)) diff --git a/src/Network/PeyoTLS/TlsHandle.hs b/src/Network/PeyoTLS/TlsHandle.hs --- a/src/Network/PeyoTLS/TlsHandle.hs +++ b/src/Network/PeyoTLS/TlsHandle.hs @@ -22,7 +22,7 @@ import qualified Data.ByteString as BS import qualified Data.ByteString.Char8 as BSC -import qualified Codec.Bytable as B +import qualified Codec.Bytable.BigEndian as B import qualified Crypto.Hash.SHA256 as SHA256 import Network.PeyoTLS.TlsMonad (