From 3900531e0d1a6644bebe19e451fef907100d77b6 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 27 Oct 2021 11:40:12 +0200
Subject: eliminate HKDF when hashing paytos

---
 contrib/gana     |  2 +-
 src/util/payto.c | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/contrib/gana b/contrib/gana
index 17555514b..8c7d9be40 160000
--- a/contrib/gana
+++ b/contrib/gana
@@ -1 +1 @@
-Subproject commit 17555514bd2866e0d45b23e4a1c198415205c8f2
+Subproject commit 8c7d9be40ba627348da3e01b91b4f1d3cc78631f
diff --git a/src/util/payto.c b/src/util/payto.c
index bc8370c40..26872f1ee 100644
--- a/src/util/payto.c
+++ b/src/util/payto.c
@@ -260,22 +260,7 @@ void
 TALER_payto_hash (const char *payto,
                   struct TALER_PaytoHash *h_payto)
 {
-  /* FIXME: 0.8 had TWO WAYS to hash a payto!
-     one for the exchange, the other
-     for merchants (i.e. reserve closing).
-     I think we should unify... */
-#if OLD_EXCHANGE_WAY
-  GNUNET_assert (GNUNET_YES ==
-                 GNUNET_CRYPTO_kdf (hc,
-                                    sizeof (*hc),
-                                    payto_uri,
-                                    strlen (payto_uri) + 1,
-                                    "exchange-wire-signature",
-                                    strlen ("exchange-wire-signature"),
-                                    NULL, 0));
-#else
   GNUNET_CRYPTO_hash (payto,
                       strlen (payto) + 1,
                       &h_payto->hash);
-#endif
 }
-- 
cgit v1.2.3