summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoman Smrž <roman.smrz@seznam.cz>2019-07-17 22:36:29 +0200
committerRoman Smrž <roman.smrz@seznam.cz>2019-07-17 22:36:29 +0200
commit829d71729effa345ca593a21f61349aac7474a62 (patch)
treeade383a2f03eaa4c58fe8bfb04d2f299d79b91b3 /src
parentc64e059fca7377d67baecb2724e3be2e1cc9ff0d (diff)
Standard AES-GCM layout without padding
Diffstat (limited to 'src')
-rw-r--r--src/Channel.hs13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/Channel.hs b/src/Channel.hs
index 9be4405..4627d70 100644
--- a/src/Channel.hs
+++ b/src/Channel.hs
@@ -17,7 +17,6 @@ import Control.Monad.Fail
import Crypto.Cipher.AES
import Crypto.Cipher.Types
-import Crypto.Data.Padding
import Crypto.Error
import Crypto.Random
@@ -135,17 +134,17 @@ channelEncrypt :: (ByteArray ba, MonadRandom m, MonadFail m) => Channel -> ba ->
channelEncrypt ch plain = do
CryptoPassed (cipher :: AES128) <- return $ cipherInit $ chKey ch
let bsize = blockSize cipher
- (iv :: ByteString) <- getRandomBytes bsize
+ (iv :: ByteString) <- getRandomBytes 12
CryptoPassed aead <- return $ aeadInit AEAD_GCM cipher iv
- let (tag, ctext) = aeadSimpleEncrypt aead B.empty (pad (PKCS7 bsize) plain) bsize
- return $ BA.concat [ convert iv, convert tag, ctext ]
+ let (tag, ctext) = aeadSimpleEncrypt aead B.empty plain bsize
+ return $ BA.concat [ convert iv, ctext, convert tag ]
channelDecrypt :: (ByteArray ba, MonadFail m) => Channel -> ba -> m ba
channelDecrypt ch body = do
CryptoPassed (cipher :: AES128) <- return $ cipherInit $ chKey ch
let bsize = blockSize cipher
- (iv, body') = BA.splitAt bsize body
- (tag, ctext) = BA.splitAt bsize body'
+ (iv, body') = BA.splitAt 12 body
+ (ctext, tag) = BA.splitAt (BA.length body' - bsize) body'
CryptoPassed aead <- return $ aeadInit AEAD_GCM cipher iv
- Just plain <- return $ unpad (PKCS7 bsize) =<< aeadSimpleDecrypt aead B.empty ctext (AuthTag $ convert tag)
+ Just plain <- return $ aeadSimpleDecrypt aead B.empty ctext (AuthTag $ convert tag)
return plain