taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

removing dead TALER_genkey() API call

Browse Source
This commit is contained in:
Christian Grothoff 2015-01-09 17:12:13 +01:00
parent 0b40e78027
commit 09ecea9ea3
2 changed files with 5 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/include/taler_util.h
View File

@ -110,17 +110,7 @@ struct TALER_Amount
* Initialize Gcrypt library. * Initialize Gcrypt library.
*/ */
void void
TALER_gcrypt_init(); TALER_gcrypt_init (void);
/**
* Generate a ECC private key.
*
* @return the s-expression representing the generated ECC private key; NULL
* upon error
*/
gcry_sexp_t
TALER_genkey ();
/** /**

45
src/util/util.c
View File

@ -17,7 +17,7 @@
/** /**
* @file util.c * @file util.c
* @brief Common utility functions * @brief Common utility functions
* @author Sree Harsha Totakura <sreeharsha@totakura.in> * @author Sree Harsha Totakura <sreeharsha@totakura.in>
* @author Florian Dold * @author Florian Dold
* @author Benedikt Mueller * @author Benedikt Mueller
*/ */
@ -58,43 +58,6 @@ TALER_gcrypt_init()
} }
/**
* Generate a ECC private key.
*
* @return the s-expression representing the generated ECC private key; NULL
* upon error
*/
gcry_sexp_t
TALER_genkey ()
{
gcry_sexp_t priv_sexp;
gcry_sexp_t s_keyparam;
int rc;
if (0 != (rc = gcry_sexp_build (&s_keyparam, NULL,
"(genkey(ecc(curve \"" CURVE "\")"
"(flags eddsa)))")))
{
LOG_GCRY_ERROR ("gcry_sexp_build", rc);
return NULL;
}
if (0 != (rc = gcry_pk_genkey (&priv_sexp, s_keyparam)))
{
LOG_GCRY_ERROR ("gcry_pk_genkey", rc);
gcry_sexp_release (s_keyparam);
return NULL;
}
gcry_sexp_release (s_keyparam);
if (0 != (rc = gcry_pk_testkey (priv_sexp)))
{
LOG_GCRY_ERROR("gcry_pk_testkey", rc);
gcry_sexp_release (priv_sexp);
return NULL;
}
return priv_sexp;
}
/** /**
* Parse money amount description, in the format "A:B.C". * Parse money amount description, in the format "A:B.C".
* *
@ -123,7 +86,7 @@ TALER_string_to_amount (const char *str, struct TALER_Amount *denom)
printf("null before currency\n"); printf("null before currency\n");
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
while (str[i] != ':') while (str[i] != ':')
{ {
if (0 == str[i]) if (0 == str[i])
@ -197,7 +160,7 @@ TALER_string_to_amount (const char *str, struct TALER_Amount *denom)
/** /**
* FIXME * FIXME
*/ */
struct TALER_AmountNBO struct TALER_AmountNBO
TALER_amount_hton (struct TALER_Amount d) TALER_amount_hton (struct TALER_Amount d)
{ {
struct TALER_AmountNBO dn; struct TALER_AmountNBO dn;
@ -462,7 +425,7 @@ derive_refresh_key (const struct GNUNET_HashCode *secret,
static const char ctx_key[] = "taler-key-skey"; static const char ctx_key[] = "taler-key-skey";
static const char ctx_iv[] = "taler-key-iv"; static const char ctx_iv[] = "taler-key-iv";
GNUNET_assert (GNUNET_YES == GNUNET_assert (GNUNET_YES ==
GNUNET_CRYPTO_kdf (skey, sizeof (struct GNUNET_CRYPTO_SymmetricSessionKey), GNUNET_CRYPTO_kdf (skey, sizeof (struct GNUNET_CRYPTO_SymmetricSessionKey),
ctx_key, strlen (ctx_key), ctx_key, strlen (ctx_key),
secret, sizeof (struct GNUNET_HashCode), secret, sizeof (struct GNUNET_HashCode),