From 6f9beb70e7956c7772903b8ba3ecfa43a874c31c Mon Sep 17 00:00:00 2001 From: Sergey Ivanov Date: Thu, 16 Feb 2023 08:14:33 +0400 Subject: [PATCH] Fix wrong deserialise call --- hbs2-core/lib/HBS2/Net/Auth/AccessKey.hs | 2 +- hbs2/Main.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hbs2-core/lib/HBS2/Net/Auth/AccessKey.hs b/hbs2-core/lib/HBS2/Net/Auth/AccessKey.hs index cb33a652..aebac865 100644 --- a/hbs2-core/lib/HBS2/Net/Auth/AccessKey.hs +++ b/hbs2-core/lib/HBS2/Net/Auth/AccessKey.hs @@ -122,4 +122,4 @@ mkEncryptedKey kr pk = EncryptedBox <$> Encrypt.boxSeal pk ((LBS.toStrict . seri openEncryptedKey :: EncryptedBox -> KeyringEntry MerkleEncryptionType -> Maybe (KeyringEntry MerkleEncryptionType) openEncryptedKey (EncryptedBox bs) kr = - deserialise . LBS.fromStrict =<< Encrypt.boxSealOpen (_krPk kr) (_krSk kr) bs + either (const Nothing) Just . deserialiseOrFail . LBS.fromStrict =<< Encrypt.boxSealOpen (_krPk kr) (_krSk kr) bs diff --git a/hbs2/Main.hs b/hbs2/Main.hs index bcb08b5c..d80096e6 100644 --- a/hbs2/Main.hs +++ b/hbs2/Main.hs @@ -230,7 +230,7 @@ runStore opts ss = do & S.mapM (fmap LBS.fromStrict . Encrypt.boxSeal ((_krPk . encryptionKey) gk) . LBS.toStrict) mhash <- putAsMerkle ss encryptedChunks - mtree <- ((deserialise =<<) <$> getBlock ss (fromMerkleHash mhash)) + mtree <- ((either (const Nothing) Just . deserialiseOrFail =<<) <$> getBlock ss (fromMerkleHash mhash)) `orDie` "merkle tree was not stored properly with `putAsMerkle`" mannh <- maybe (die "can not store MerkleAnn") pure