ssh 0.2.9 → 0.2.10
raw patch · 2 files changed
+8/−5 lines, 2 filesdep +crypto-pubkey-typesdep ~RSAdep ~asn1-datanew-uploader
Dependencies added: crypto-pubkey-types
Dependency ranges changed: RSA, asn1-data
Files
- src/SSH/Crypto.hs +3/−1
- ssh.cabal +5/−4
src/SSH/Crypto.hs view
@@ -11,6 +11,8 @@ import qualified Data.ByteString.Lazy as LBS import qualified OpenSSL.DSA as DSA +import qualified Crypto.Types.PubKey.RSA as RSAKey+ import SSH.Packet import SSH.NetReader import SSH.Util@@ -142,7 +144,7 @@ sign :: KeyPair -> LBS.ByteString -> IO LBS.ByteString sign (RSAKeyPair (RSAPublicKey _ n) d) m = return $ LBS.concat [ netString "ssh-rsa"- , netLBS (RSA.rsassa_pkcs1_v1_5_sign RSA.ha_SHA1 (RSA.PrivateKey 256 n d) m)+ , netLBS (RSA.rsassa_pkcs1_v1_5_sign RSA.ha_SHA1 (RSAKey.PrivateKey 256 n d 0 0 0 0 0) m) ] sign (DSAKeyPair (DSAPublicKey p q g y) x) m = do (r, s) <- DSA.signDigestedDataWithDSA (DSA.tupleToDSAKeyPair (p, q, g, y, x)) digest
ssh.cabal view
@@ -1,5 +1,5 @@ name: ssh-version: 0.2.9+version: 0.2.10 synopsis: A pure-Haskell SSH server library. description: This package was split from darcsden into its own project; documentation@@ -14,7 +14,7 @@ license: BSD3 license-file: LICENSE author: Alex Suraci-maintainer: suraci.alex@gmail.com+maintainer: i.am@toogeneric.com category: Network build-type: Simple cabal-version: >= 1.6@@ -43,7 +43,7 @@ other-modules: SSH.Debug, SSH.Util - build-depends: asn1-data >= 0.5 && < 0.6,+ build-depends: asn1-data >= 0.6.1.2 && < 0.7, base >= 4 && < 5, base64-string, binary,@@ -51,11 +51,12 @@ cereal, containers, crypto-api,+ crypto-pubkey-types >= 0.1 && < 0.2, cryptohash, HsOpenSSL >= 0.8, network, process,- RSA,+ RSA >= 1.2 && < 1.3, random, SHA, SimpleAES,