openid 0.2.0.2 → 0.2.1.0

raw patch · 7 files changed

+20/−13 lines, 7 filesdep +base-compatdep +network-uridep ~HsOpenSSLdep ~networkPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependencies added: base-compat, network-uri

Dependency ranges changed: HsOpenSSL, network

API changes (from Hackage documentation)

Files

• openid.cabal +5/−3
• src/Data/Digest/OpenSSL/SHA.hs +4/−3
• src/Network/OpenID/Association.hs +3/−1
• src/Network/OpenID/Association/Map.hs +2/−2
• src/Network/OpenID/AttributeExchange.hs +2/−1
• src/Network/OpenID/Discovery.hs +2/−2
• src/Network/OpenID/SSL.hs +2/−1

@@ -1,5 +1,5 @@ name:               openid-version:            0.2.0.2+version:            0.2.1.0 cabal-version:      >= 1.8 synopsis:           An implementation of the OpenID-2.0 spec. description:        An implementation of the OpenID-2.0 spec.@@ -27,14 +27,16 @@  library   build-depends:   base       >= 4.0.0.0 && < 5,+                   base-compat,                    bytestring >= 0.9.1.0,                    containers >= 0.2.0.0,                    HTTP       >= 4000.0.9,                    monadLib   >= 3.6.0.0,-                   network    >= 2.2.0.0,+                   network    >= 2.6.0.0,+                   network-uri>= 2.6.0.0,                    time       >= 1.1.0.0,                    xml        >= 1.3.0.0,-                   HsOpenSSL  >= 0.9.0.0+                   HsOpenSSL  >= 0.11.4   hs-source-dirs:  src   exposed-modules: Codec.Binary.Base64,                    Codec.Encryption.DH,

@@ -16,6 +16,7 @@ import Control.Exception import Foreign import Foreign.C+import System.IO.Unsafe (unsafePerformIO)  data EVP_MD data EVP_MD_CTX@@ -38,11 +39,11 @@   bracket c_EVP_MD_CTX_create c_EVP_MD_CTX_destroy $ \ evp_md_ctx ->   withArrayLen (map (toEnum . fromEnum) bs) $ \ len arr -> do     h <- hf-    c_EVP_DigestInit_ex  evp_md_ctx h nullPtr-    c_EVP_DigestUpdate   evp_md_ctx arr (toEnum len)+    _ <- c_EVP_DigestInit_ex  evp_md_ctx h nullPtr+    _ <- c_EVP_DigestUpdate   evp_md_ctx arr (toEnum len)     allocaArray 64 $ \ hash ->       alloca $ \ num  -> do-        c_EVP_DigestFinal_ex evp_md_ctx hash num+        _ <- c_EVP_DigestFinal_ex evp_md_ctx hash num         n <- peek num         hs <- peekArray (fromEnum n) hash         return $ map (toEnum . fromEnum) hs

@@ -36,6 +36,8 @@ import Network.OpenID.Utils  -- Libraries+import Prelude()+import Prelude.Compat import Data.Bits import Data.Maybe import Data.Time@@ -123,7 +125,7 @@  -- | Association monad newtype Assoc m a = Assoc (ReaderT (AssocEnv m) (ExceptionT Error m) a)-  deriving (Functor,Monad)+  deriving (Functor,Applicative,Monad)  instance MonadT Assoc where   lift = Assoc . lift . lift

@@ -32,8 +32,8 @@ instance AssociationManager AssociationMap where   findAssociation (AM m) p = snd `fmap` Map.lookup (showProvider p) m -  addAssociation (AM m) now p a = AM (Map.insert (showProvider p) (expire,a) m)-    where expire = addUTCTime (toEnum (assocExpiresIn a)) now+  addAssociation (AM m) now p a = AM (Map.insert (showProvider p) (ex,a) m)+    where ex = addUTCTime (toEnum (assocExpiresIn a)) now    expire (AM m) now = AM (Map.filter ((now >) . fst) m) 

@@ -9,7 +9,8 @@     getAxFields ) where -import Control.Applicative+import Prelude()+import Prelude.Compat import Control.Monad (guard) import Network.OpenID.Types 

@@ -54,10 +54,10 @@       uri = fromMaybe (getIdentifier ident) mb_loc   case parseURI uri of     Nothing  -> err "Unable to parse identifier as a URI"-    Just uri -> do+    Just u   -> do       estr <- lift $ resolve Request         { rqMethod  = GET-        , rqURI     = uri+        , rqURI     = u         , rqHeaders = []         , rqBody    = ""         }

@@ -15,12 +15,13 @@         sslConnect     ) where +import Prelude()+import Prelude.Compat import OpenSSL.Session as Session import qualified Control.Exception as E import Network.Socket import Network.Stream import qualified Data.ByteString as B-import Control.Applicative import Data.ByteString.Internal (w2c, c2w) import Data.Word