1 files changed, 7 insertions, 334 deletions

diff --git a/src/include/taler_util.h b/src/include/taler_util.h
index 00f139286..f2f319720 100644
--- a/src/include/taler_util.h
+++ b/src/include/taler_util.h
@@ -18,11 +18,15 @@
  * @brief Interface for common utility functions
  * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  */
-#ifndef TALER_UTIL_H_
-#define TALER_UTIL_H_
+#ifndef TALER_UTIL_H
+#define TALER_UTIL_H
 
 #include <gnunet/gnunet_util_lib.h>
-#include <gcrypt.h>
+#include "taler_amount_lib.h"
+#include "taler_crypto_lib.h"
+#include "taler_json_lib.h"
+
+
 
 /* Define logging functions */
 #define LOG_DEBUG(...)                                  \
@@ -50,7 +54,6 @@
   } while(0)
 
 
-
 /**
  * Log an error message at log-level 'level' that indicates
  * a failure of the command 'cmd' with the message given
@@ -63,7 +66,6 @@
   do {int rc; rc = cmd; if (!rc) break; LOG_ERROR("A Gcrypt call failed at %s:%d with error: %s\n", __FILE__, __LINE__, gcry_strerror(rc)); abort(); } while (0)
 
 
-
 /**
  * Initialize Gcrypt library.
  */
@@ -83,333 +85,4 @@ TALER_config_load (const char *base_dir);
 
 
 
-/* *********************** Amount management ****************** */
-
-
-/**
- * Number of characters (plus 1 for 0-termination) we use to
- * represent currency names (i.e. EUR, USD, etc.).  We use
- * 8 for alignment (!).
- */
-#define TALER_CURRENCY_LEN 8
-
-
-GNUNET_NETWORK_STRUCT_BEGIN
-
-/**
- * Amount, encoded for network transmission.
- */
-struct TALER_AmountNBO
-{
-  /**
-   * Value in the main currency, in NBO.
-   */
-  uint32_t value;
-
-  /**
-   * Additinal fractional value, in NBO.
-   */
-  uint32_t fraction;
-
-  /**
-   * Type of the currency being represented.
-   */
-  char currency[TALER_CURRENCY_LEN];
-};
-
-GNUNET_NETWORK_STRUCT_END
-
-
-/**
- * Representation of monetary value in a given currency.
- */
-struct TALER_Amount
-{
-  /**
-   * Value (numerator of fraction)
-   */
-  uint32_t value;
-
-  /**
-   * Fraction (denominator of fraction)
-   */
-  uint32_t fraction;
-
-  /**
-   * Currency string, left adjusted and padded with zeros.
-   */
-  char currency[TALER_CURRENCY_LEN];
-};
-
-
-/**
- * Parse denomination description, in the format "T : V : F".
- *
- * @param str denomination description
- * @param denom denomination to write the result to
- * @return #GNUNET_OK if the string is a valid denomination specification,
- *         #GNUNET_SYSERR if it is invalid.
- */
-int
-TALER_string_to_amount (const char *str,
-                        struct TALER_Amount *denom);
-
-
-/**
- * Convert amount from host to network representation.
- *
- * @param d amount in host representation
- * @return amount in network representation
- */
-struct TALER_AmountNBO
-TALER_amount_hton (struct TALER_Amount d);
-
-
-/**
- * Convert amount from network to host representation.
- *
- * @param d amount in network representation
- * @return amount in host representation
- */
-struct TALER_Amount
-TALER_amount_ntoh (struct TALER_AmountNBO dn);
-
-
-/**
- * Compare the value/fraction of two amounts.  Does not compare the currency,
- * i.e. comparing amounts with the same value and fraction but different
- * currency would return 0.
- *
- * @param a1 first amount
- * @param a2 second amount
- * @return result of the comparison
- */
-int
-TALER_amount_cmp (struct TALER_Amount a1,
-                  struct TALER_Amount a2);
-
-
-/**
- * Perform saturating subtraction of amounts.
- *
- * @param a1 amount to subtract from
- * @param a2 amount to subtract
- * @return (a1-a2) or 0 if a2>=a1
- */
-struct TALER_Amount
-TALER_amount_subtract (struct TALER_Amount a1,
-                       struct TALER_Amount a2);
-
-
-/**
- * Perform saturating addition of amounts
- *
- * @param a1 first amount to add
- * @param a2 second amount to add
- * @return sum of a1 and a2
- */
-struct TALER_Amount
-TALER_amount_add (struct TALER_Amount a1,
-                  struct TALER_Amount a2);
-
-
-/**
- * Normalize the given amount.
- *
- * @param amout amount to normalize
- * @return normalized amount
- */
-struct TALER_Amount
-TALER_amount_normalize (struct TALER_Amount amount);
-
-
-/**
- * Convert amount to string.
- *
- * @param amount amount to convert to string
- * @return freshly allocated string representation
- */
-char *
-TALER_amount_to_string (struct TALER_Amount amount);
-
-
-/* ****************** Coin crypto primitives ************* */
-
-/**
- * Public information about a coin (including the public key
- * of the coin, the denomination key and the signature with
- * the denomination key).
- */
-struct TALER_CoinPublicInfo
-{
-  /**
-   * The coin's public key.
-   */
-  struct GNUNET_CRYPTO_EcdsaPublicKey coin_pub;
-
-  /**
-   * Public key representing the denomination of the coin
-   * that is being deposited.
-   */
-  struct GNUNET_CRYPTO_rsa_PublicKey *denom_pub;
-
-  /**
-   * (Unblinded) signature over @e coin_pub with @e denom_pub,
-   * which demonstrates that the coin is valid.
-   */
-  struct GNUNET_CRYPTO_rsa_Signature *denom_sig;
-};
-
-
-/**
- * Check if a coin is valid; that is, whether the denomination key exists,
- * is not expired, and the signature is correct.
- *
- * @param coin_public_info the coin public info to check for validity
- * @return #GNUNET_YES if the coin is valid,
- *         #GNUNET_NO if it is invalid
- *         #GNUNET_SYSERROR if an internal error occured
- */
-int
-TALER_test_coin_valid (const struct TALER_CoinPublicInfo *coin_public_info);
-
-
-/* ****************** Refresh crypto primitives ************* */
-
-/**
- * Secret used to decrypt the key to decrypt link secrets.
- */
-struct TALER_TransferSecret
-{
-  /**
-   * Secret used to encrypt/decrypt the `struct TALER_LinkSecret`.
-   * Must be (currently) a hash as this is what
-   * #GNUNET_CRYPTO_ecc_ecdh() returns to us.
-   */
-  struct GNUNET_HashCode key;
-};
-
-
-/**
- * Secret used to decrypt refresh links.
- */
-struct TALER_LinkSecret
-{
-  /**
-   * Secret used to decrypt the refresh link data.
-   */
-  char key[sizeof (struct GNUNET_HashCode)];
-};
-
-
-/**
- * Encrypted secret used to decrypt refresh links.
- */
-struct TALER_EncryptedLinkSecret
-{
-  /**
-   * Encrypted secret, must be the given size!
-   */
-  char enc[sizeof (struct TALER_LinkSecret)];
-};
-
-
-/**
- * Representation of an encrypted refresh link.
- */
-struct TALER_RefreshLinkEncrypted
-{
-
-  /**
-   * Encrypted blinding key with @e blinding_key_enc_size bytes,
-   * must be allocated at the end of this struct.
-   */
-  const char *blinding_key_enc;
-
-  /**
-   * Number of bytes in @e blinding_key_enc.
-   */
-  size_t blinding_key_enc_size;
-
-  /**
-   * Encrypted private key of the coin.
-   */
-  char coin_priv_enc[sizeof (struct GNUNET_CRYPTO_EcdsaPrivateKey)];
-
-};
-
-
-/**
- * Representation of an refresh link in cleartext.
- */
-struct TALER_RefreshLinkDecrypted
-{
-
-  /**
-   * Private key of the coin.
-   */
-  struct GNUNET_CRYPTO_EcdsaPrivateKey coin_priv;
-
-  /**
-   * Blinding key with @e blinding_key_enc_size bytes.
-   */
-  struct GNUNET_CRYPTO_rsa_BlindingKey *blinding_key;
-
-};
-
-
-/**
- * Use the @a trans_sec (from ECDHE) to decrypt the @a secret_enc
- * to obtain the @a secret to decrypt the linkage data.
- *
- * @param secret_enc encrypted secret
- * @param trans_sec transfer secret
- * @param secret shared secret for refresh link decryption
- * @return #GNUNET_OK on success
- */
-int
-TALER_transfer_decrypt (const struct TALER_EncryptedLinkSecret *secret_enc,
-                        const struct TALER_TransferSecret *trans_sec,
-                        struct TALER_LinkSecret *secret);
-
-
-/**
- * Use the @a trans_sec (from ECDHE) to encrypt the @a secret
- * to obtain the @a secret_enc.
- *
- * @param secret shared secret for refresh link decryption
- * @param trans_sec transfer secret
- * @param secret_enc[out] encrypted secret
- * @return #GNUNET_OK on success
- */
-int
-TALER_transfer_encrypt (const struct TALER_LinkSecret *secret,
-                        const struct TALER_TransferSecret *trans_sec,
-                        struct TALER_EncryptedLinkSecret *secret_enc);
-
-
-/**
- * Decrypt refresh link information.
- *
- * @param input encrypted refresh link data
- * @param secret shared secret to use for decryption
- * @return NULL on error
- */
-struct TALER_RefreshLinkDecrypted *
-TALER_refresh_decrypt (const struct TALER_RefreshLinkEncrypted *input,
-                       const struct TALER_LinkSecret *secret);
-
-
-/**
- * Encrypt refresh link information.
- *
- * @param input plaintext refresh link data
- * @param secret shared secret to use for encryption
- * @return NULL on error (should never happen)
- */
-struct TALER_RefreshLinkEncrypted *
-TALER_refresh_encrypt (const struct TALER_RefreshLinkDecrypted *input,
-                       const struct TALER_LinkSecret *secret);
-
-
 #endif