Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix crypto rsa import #28

Merged
merged 2 commits into from
Nov 3, 2023
Merged

Fix crypto rsa import #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a18b763
Fix import for RSA modules
amitaibu Nov 3, 2023
d419af5
More fixes
amitaibu Nov 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Application/Helper/Controller.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import IHP.ControllerPrelude
import Generated.Types
import Web.Types
import Config
import Crypto.PubKey.RSA as RSA
import "cryptonite" Crypto.PubKey.RSA as RSA
import Data.ByteString.Base64 as Base64
import Crypto.PubKey.RSA.PKCS15 as RSA.PKCS15
import Crypto.Hash.Algorithms as Hash.Algorithms
import "cryptonite" Crypto.PubKey.RSA.PKCS15 as RSA.PKCS15
import "cryptonite" Crypto.Hash.Algorithms as Hash.Algorithms


-- Here you can add functions which are available in all your controllers
Expand Down
4 changes: 2 additions & 2 deletions Application/Helper/View.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module Application.Helper.View where

import IHP.ViewPrelude
import Crypto.PubKey.RSA.PKCS15 as RSA
import Crypto.Hash.Algorithms as Hash.Algorithms
import "cryptonite" Crypto.PubKey.RSA.PKCS15 as RSA
import "cryptonite" Crypto.Hash.Algorithms as Hash.Algorithms
import Data.ByteString.Base64 as Base64
import Application.Helper.Controller

Expand Down
2 changes: 1 addition & 1 deletion Config/Config.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import IHP.Environment
import IHP.FileStorage.Config
import IHP.FrameworkConfig ( ConfigBuilder, option )
import Web.View.CustomCSSFramework
import Crypto.PubKey.RSA as RSA
import "cryptonite" Crypto.PubKey.RSA as RSA
import Control.Exception (catch)
import qualified Data.ByteString as BS
import Web.JWT
Expand Down
4 changes: 2 additions & 2 deletions Web/Controller/ImageStyle.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import System.Directory (doesFileExist)
import qualified Data.Text as Text

-- Imports for the signed token.
import Crypto.PubKey.RSA.PKCS15 as RSA
import Crypto.Hash.Algorithms as Hash.Algorithms
import "cryptonite" Crypto.PubKey.RSA.PKCS15 as RSA
import "cryptonite" Crypto.Hash.Algorithms as Hash.Algorithms
import Config
import Data.ByteString.Base64 as Base64

Expand Down
4 changes: 2 additions & 2 deletions Web/View/ParagraphQuotes/Show.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import Web.View.Prelude
import Web.Element.Types
import Web.Element.ElementWrap
import Web.Element.InnerElementLayout
import Crypto.PubKey.RSA.PKCS15 as RSA
import Crypto.Hash.Algorithms as Hash.Algorithms
import "cryptonite" Crypto.PubKey.RSA.PKCS15 as RSA
import "cryptonite" Crypto.Hash.Algorithms as Hash.Algorithms
import qualified Config
import IHP.ControllerSupport
import Data.ByteString.Base64 as Base64
Expand Down