haskell/yesod
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12 from trofi/master

Browse Source 
caught up with RSA-1.2
This commit is contained in:
Hiromi Ishii 2012-06-10 02:16:22 -07:00
commit 8311dc76ae
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
authenticate-oauth/Web/Authenticate/OAuth.hs
View File

@ -34,7 +34,8 @@ import Data.Digest.Pure.SHA
import Data.ByteString.Base64 import Data.ByteString.Base64
import Data.Time import Data.Time
import Numeric import Numeric
import Codec.Crypto.RSA (rsassa_pkcs1_v1_5_sign, ha_SHA1, PrivateKey(..)) import Codec.Crypto.RSA (rsassa_pkcs1_v1_5_sign, ha_SHA1)
import Crypto.Types.PubKey.RSA (PrivateKey(..))
import Network.HTTP.Types (Header) import Network.HTTP.Types (Header)
import Blaze.ByteString.Builder (toByteString) import Blaze.ByteString.Builder (toByteString)
import Control.Monad.IO.Class (MonadIO) import Control.Monad.IO.Class (MonadIO)
@ -108,13 +109,7 @@ data SignMethod = PLAINTEXT
| HMACSHA1 | HMACSHA1
| RSASHA1 PrivateKey | RSASHA1 PrivateKey
deriving (Show, Eq, Ord, Read, Data, Typeable) deriving (Show, Eq, Ord, Read, Data, Typeable)
deriving instance Typeable PrivateKey
deriving instance Data PrivateKey
deriving instance Read PrivateKey
deriving instance Ord PrivateKey deriving instance Ord PrivateKey
deriving instance Eq PrivateKey
-- | Data type for redential. -- | Data type for redential.
data Credential = Credential { unCredential :: [(BS.ByteString, BS.ByteString)] } data Credential = Credential { unCredential :: [(BS.ByteString, BS.ByteString)] }
deriving (Show, Eq, Ord, Read, Data, Typeable) deriving (Show, Eq, Ord, Read, Data, Typeable)

3
authenticate-oauth/authenticate-oauth.cabal
View File

@ -18,7 +18,8 @@ library
, http-conduit >= 1.4 && < 1.5 , http-conduit >= 1.4 && < 1.5
, transformers >= 0.1 && < 0.4 , transformers >= 0.1 && < 0.4
, bytestring >= 0.9 , bytestring >= 0.9
, RSA >= 1.0 && < 1.1 , crypto-pubkey-types >= 0.1 && < 0.2
, RSA >= 1.2 && < 1.3
, time , time
, data-default >= 0.3 && < 0.5 , data-default >= 0.3 && < 0.5
, base64-bytestring >= 0.1 && < 0.2 , base64-bytestring >= 0.1 && < 0.2