diff options
Diffstat (limited to 'src/util/crypto_wire.c')
| -rw-r--r-- | src/util/crypto_wire.c | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/src/util/crypto_wire.c b/src/util/crypto_wire.c index ee3215ca6..8560aaf30 100644 --- a/src/util/crypto_wire.c +++ b/src/util/crypto_wire.c @@ -32,7 +32,7 @@ */ void TALER_exchange_wire_signature_hash (const char *payto_uri, - struct GNUNET_HashCode *hc) + struct TALER_PaytoHash *hc) { GNUNET_assert (GNUNET_YES == GNUNET_CRYPTO_kdf (hc, @@ -111,10 +111,8 @@ TALER_exchange_wire_signature_make ( void TALER_merchant_wire_signature_hash (const char *payto_uri, const struct TALER_WireSalt *salt, - struct GNUNET_HashCode *hc) + struct TALER_MerchantWireHash *hc) { -#if FIXED_7032 - /* new logic to use once #7032 is being addressed */ GNUNET_assert (GNUNET_YES == GNUNET_CRYPTO_kdf (hc, sizeof (*hc), @@ -125,24 +123,6 @@ TALER_merchant_wire_signature_hash (const char *payto_uri, "merchant-wire-signature", strlen ("merchant-wire-signature"), NULL, 0)); -#else - /* compatibility logic to avoid protocol breakage... */ - char *sstr; - - sstr = GNUNET_STRINGS_data_to_string_alloc (salt, - sizeof (*salt)); - GNUNET_assert (GNUNET_YES == - GNUNET_CRYPTO_kdf (hc, - sizeof (*hc), - sstr, - strlen (sstr) + 1, - payto_uri, - strlen (payto_uri) + 1, - "merchant-wire-signature", - strlen ("merchant-wire-signature"), - NULL, 0)); - GNUNET_free (sstr); -#endif } @@ -170,7 +150,7 @@ TALER_merchant_wire_signature_check ( const struct TALER_MerchantPublicKeyP *merch_pub, const struct TALER_MerchantSignatureP *merch_sig) { - struct TALER_MasterWireDetailsPS wd = { + struct TALER_MerchantWireDetailsPS wd = { .purpose.purpose = htonl (TALER_SIGNATURE_MERCHANT_WIRE_DETAILS), .purpose.size = htonl (sizeof (wd)) }; @@ -200,7 +180,7 @@ TALER_merchant_wire_signature_make ( const struct TALER_MerchantPrivateKeyP *merch_priv, struct TALER_MerchantSignatureP *merch_sig) { - struct TALER_MasterWireDetailsPS wd = { + struct TALER_MerchantWireDetailsPS wd = { .purpose.purpose = htonl (TALER_SIGNATURE_MERCHANT_WIRE_DETAILS), .purpose.size = htonl (sizeof (wd)) }; |