Merge pull request #525 from locallycompact/hydra/sha3_512

Add SHA512 and SHA3_512 algorithms.

Author: lehins

cardano-crypto-class/CHANGELOG.md

@@ -1,8 +1,8 @@
 # Changelog for `cardano-crypto-class`
 
-## 2.2.1.1
+## 2.2.2.0
 
-*
+* Add `SHA512` and `SHA3_512` algorithms.
 
 ## 2.2.1.0
 

cardano-crypto-class/cardano-crypto-class.cabal

@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name: cardano-crypto-class
-version: 2.2.1.0
+version: 2.2.2.0
 synopsis:
   Type classes abstracting over cryptography primitives for Cardano
 
@@ -64,6 +64,8 @@ library
     Cardano.Crypto.Hash.RIPEMD160
     Cardano.Crypto.Hash.SHA256
     Cardano.Crypto.Hash.SHA3_256
+    Cardano.Crypto.Hash.SHA3_512
+    Cardano.Crypto.Hash.SHA512
     Cardano.Crypto.Hash.Short
     Cardano.Crypto.Init
     Cardano.Crypto.KES

cardano-crypto-class/src/Cardano/Crypto/Hash.hs

@@ -10,4 +10,6 @@ import Cardano.Crypto.Hash.Keccak256 as X
 import Cardano.Crypto.Hash.NeverUsed as X
 import Cardano.Crypto.Hash.SHA256 as X
 import Cardano.Crypto.Hash.SHA3_256 as X
+import Cardano.Crypto.Hash.SHA3_512 as X
+import Cardano.Crypto.Hash.SHA512 as X
 import Cardano.Crypto.Hash.Short as X

cardano-crypto-class/src/Cardano/Crypto/Hash/SHA3_512.hs

@@ -0,0 +1,23 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE PackageImports #-}
+{-# LANGUAGE TypeFamilies #-}
+
+-- | Implementation of the SHA3_512 hashing algorithm.
+module Cardano.Crypto.Hash.SHA3_512 (
+  SHA3_512,
+)
+where
+
+import Cardano.Crypto.Hash.Class
+import qualified Data.ByteArray as BA
+import qualified "crypton" Crypto.Hash as H
+
+data SHA3_512
+
+instance HashAlgorithm SHA3_512 where
+  type SizeHash SHA3_512 = 64
+  hashAlgorithmName _ = "sha3-512"
+  digest _ = convert . H.hash
+
+convert :: H.Digest H.SHA3_512 -> ByteString
+convert = BA.convert

cardano-crypto-class/src/Cardano/Crypto/Hash/SHA512.hs

@@ -0,0 +1,23 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE PackageImports #-}
+{-# LANGUAGE TypeFamilies #-}
+
+-- | Implementation of the SHA512 hashing algorithm.
+module Cardano.Crypto.Hash.SHA512 (
+  SHA512,
+)
+where
+
+import Cardano.Crypto.Hash.Class
+import qualified Data.ByteArray as BA
+import qualified "crypton" Crypto.Hash as H
+
+data SHA512
+
+instance HashAlgorithm SHA512 where
+  type SizeHash SHA512 = 64
+  hashAlgorithmName _ = "sha512"
+  digest _ = convert . H.hash
+
+convert :: H.Digest H.SHA512 -> ByteString
+convert = BA.convert

cardano-crypto-tests/CHANGELOG.md

@@ -1,7 +1,8 @@
 # Changelog for `cardano-crypto-tests`
 
-## 2.2.0.1
+## 2.2.1.0
 
+* Add test for `SHA512` and `SHA3_512` algorithms.
 * Add tests using standard test vectors and generated ones for Praos and PraosBatchCompat
 
 ## 2.2.0.0

cardano-crypto-tests/cardano-crypto-tests.cabal

@@ -1,6 +1,6 @@
 cabal-version: 2.2
 name: cardano-crypto-tests
-version: 2.2.0.0
+version: 2.2.1.0
 synopsis: Tests for cardano-crypto-class and -praos
 description: Tests for cardano-crypto-class and -praos
 license: Apache-2.0
@@ -89,7 +89,7 @@ library
     base16-bytestring,
     bytestring >=0.10.12.0,
     cardano-binary,
-    cardano-crypto-class ^>=2.2,
+    cardano-crypto-class ^>=2.2.2,
     cardano-crypto-praos,
     cborg,
     containers,

cardano-crypto-tests/src/Test/Crypto/Hash.hs

@@ -42,6 +42,8 @@ tests lock =
     , testHashAlgorithm (Proxy :: Proxy Keccak256)
     , testSodiumHashAlgorithm lock (Proxy :: Proxy SHA256)
     , testSodiumHashAlgorithm lock (Proxy :: Proxy Blake2b_256)
+    , testHashAlgorithm (Proxy :: Proxy SHA512)
+    , testHashAlgorithm (Proxy :: Proxy SHA3_512)
     , testPackedBytes
     ]