Use CC.encryptedCreateDirectWithoutTweak

cardano-foundation · Feb 24, 2020 · 3858dbb · 3858dbb
1 parent 5f4d255
commit 3858dbb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/lib/core/src/Cardano/Wallet/Primitive/AddressDerivation.hs b/lib/core/src/Cardano/Wallet/Primitive/AddressDerivation.hs
@@ -772,12 +772,13 @@ data ErrXPrvFromStrippedPubXPrv
 xPrvFromStrippedPubXPrv :: ByteString -> Either ErrXPrvFromStrippedPubXPrv XPrv
 xPrvFromStrippedPubXPrv x =
     let
-        res = toXPrv $ CC.encryptedCreateDirectWithTweak x pass
+        res = toXPrv $ CC.encryptedCreateDirectWithoutTweak prv cc pass
     in
         if BS.length x == expectedInputLength
         then res
         else Left $ ErrInputLengthMismatch expectedInputLength (BS.length x)
   where
+    (prv, cc) = BS.splitAt 64 x
     pass :: ByteString
     pass = ""
 

diff --git a/lib/core/test/unit/Cardano/Wallet/Primitive/AddressDerivationSpec.hs b/lib/core/test/unit/Cardano/Wallet/Primitive/AddressDerivationSpec.hs
@@ -317,9 +317,8 @@ prop_unXPrvStripRoundtrip (XPrvWithPass k enc) = do
         Left ErrNoRoundtripMismatch ->
             enc /= Passphrase ""
                 & label "mismatch"
-                & counterexample "XPrv should be encrypted for the roundtrip to\
-                                 \fail"
-        Left ErrUnexpectedRoundtripError ->
+                & counterexample "XPrv should be encrypted for the roundtrip to fail"
+        Left (ErrUnexpectedRoundtripError) ->
             counterexample "unexpected error" $ property False
 
 prop_xPrvFromStrippedPubXPrvLengthRequirement

diff --git a/stack.yaml b/stack.yaml
@@ -34,8 +34,8 @@ extra-deps:
     - persistent-template
 
 # cardano-crypto
-- git: https://github.com/input-output-hk/cardano-crypto
-  commit: 3c5db489c71a4d70ee43f5f9b979fcde3c797f2a
+- git: https://github.com/Anviking/cardano-crypto
+  commit: a6c3bfe12290cf4f6ac47836a1acb3d417da9d96
 
 # iohk-monitoring-framework
 - git: https://github.com/input-output-hk/iohk-monitoring-framework