[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r28442 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r28442 - gnunet/src/util |
Date: |
Wed, 7 Aug 2013 23:27:39 +0200 |
Author: grothoff
Date: 2013-08-07 23:27:39 +0200 (Wed, 07 Aug 2013)
New Revision: 28442
Modified:
gnunet/src/util/crypto_ecc.c
gnunet/src/util/test_crypto_ecc.c
Log:
-testcase for new ECC crypto functions
Modified: gnunet/src/util/crypto_ecc.c
===================================================================
--- gnunet/src/util/crypto_ecc.c 2013-08-07 21:26:46 UTC (rev 28441)
+++ gnunet/src/util/crypto_ecc.c 2013-08-07 21:27:39 UTC (rev 28442)
@@ -203,19 +203,18 @@
{
gcry_sexp_t result;
gcry_mpi_t d;
- size_t erroff;
int rc;
mpi_scan (&d,
priv->d,
sizeof (priv->d));
- rc = gcry_sexp_build (&result, &erroff,
+ rc = gcry_sexp_build (&result, NULL,
"(private-key(ecdsa(curve \"" CURVE "\")(d %m)))",
d);
gcry_mpi_release (d);
if (0 != rc)
{
- LOG_GCRY (GNUNET_ERROR_TYPE_ERROR, "gcry_sexp_build", rc); /* erroff
gives more info */
+ LOG_GCRY (GNUNET_ERROR_TYPE_ERROR, "gcry_sexp_build", rc);
GNUNET_assert (0);
}
#if EXTRA_CHECKS
@@ -244,7 +243,7 @@
{
gcry_mpi_t q_x;
gcry_mpi_t q_y;
-
+
q_x = gcry_mpi_new (256);
q_y = gcry_mpi_new (256);
if (gcry_mpi_ec_get_affine (q_x, q_y, q, ctx))
@@ -272,15 +271,10 @@
gcry_sexp_t sexp;
gcry_ctx_t ctx;
gcry_mpi_point_t q;
- int rc;
sexp = decode_private_key (priv);
GNUNET_assert (NULL != sexp);
- if (0 != (rc = gcry_mpi_ec_new (&ctx, sexp, NULL)))
- {
- LOG_GCRY (GNUNET_ERROR_TYPE_ERROR, "gcry_mpi_ec_new", rc); /* erroff
gives more info */
- return;
- }
+ GNUNET_assert (0 == gcry_mpi_ec_new (&ctx, sexp, NULL));
gcry_sexp_release (sexp);
q = gcry_mpi_ec_get_point ("q", ctx, 0);
point_to_public_key (q, ctx, pub);
@@ -364,7 +358,6 @@
gcry_mpi_t q_y;
gcry_mpi_point_t q;
gcry_ctx_t ctx;
- int rc;
mpi_scan (&q_x, pub->q_x, sizeof (pub->q_x));
mpi_scan (&q_y, pub->q_y, sizeof (pub->q_y));
@@ -373,24 +366,13 @@
gcry_mpi_release (q_x);
gcry_mpi_release (q_y);
- /* create basic ECC context */
- if (0 != (rc = gcry_mpi_ec_new (&ctx, NULL, CURVE)))
- {
- LOG_GCRY (GNUNET_ERROR_TYPE_ERROR, "gcry_mpi_ec_new", rc); /* erroff
gives more info */
- gcry_mpi_point_release (q);
- return NULL;
- }
/* initialize 'ctx' with 'q' */
+ GNUNET_assert (0 == gcry_mpi_ec_new (&ctx, NULL, CURVE));
gcry_mpi_ec_set_point ("q", q, ctx);
gcry_mpi_point_release (q);
/* convert 'ctx' to 'sexp' */
- if (0 != (rc = gcry_pubkey_get_sexp (&pub_sexp, GCRY_PK_GET_PUBKEY, ctx)))
- {
- LOG_GCRY (GNUNET_ERROR_TYPE_ERROR, "gcry_sexp_from_context", rc);
- gcry_ctx_release (ctx);
- return NULL;
- }
+ GNUNET_assert (0 == gcry_pubkey_get_sexp (&pub_sexp, GCRY_PK_GET_PUBKEY,
ctx));
gcry_ctx_release (ctx);
return pub_sexp;
}
@@ -438,7 +420,7 @@
return NULL;
}
gcry_sexp_release (priv_sexp);
- priv = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_EccPrivateKey));
+ priv = GNUNET_new (struct GNUNET_CRYPTO_EccPrivateKey);
mpi_print (priv->d, sizeof (priv->d), d);
gcry_mpi_release (d);
return priv;
@@ -521,7 +503,7 @@
GNUNET_DISK_PERM_USER_WRITE);
if (NULL == fd)
{
- if (errno == EEXIST)
+ if (EEXIST == errno)
{
if (GNUNET_YES != GNUNET_DISK_file_test (filename))
{
@@ -538,7 +520,6 @@
return NULL;
}
cnt = 0;
-
while (GNUNET_YES !=
GNUNET_DISK_file_lock (fd, 0,
sizeof (struct GNUNET_CRYPTO_EccPrivateKey),
@@ -816,7 +797,6 @@
gcry_sexp_t data;
gcry_sexp_t sig_sexpr;
gcry_sexp_t pub_sexpr;
- size_t erroff;
int rc;
gcry_mpi_t r;
gcry_mpi_t s;
@@ -827,7 +807,8 @@
/* build s-expression for signature */
mpi_scan (&r, sig->r, sizeof (sig->r));
mpi_scan (&s, sig->s, sizeof (sig->s));
- if (0 != (rc = gcry_sexp_build (&sig_sexpr, &erroff, "(sig-val(ecdsa(r %m)(s
%m)))",
+ if (0 != (rc = gcry_sexp_build (&sig_sexpr, NULL,
+ "(sig-val(ecdsa(r %m)(s %m)))",
r, s)))
{
LOG_GCRY (GNUNET_ERROR_TYPE_ERROR, "gcry_sexp_build", rc);
@@ -873,9 +854,9 @@
struct GNUNET_HashCode *key_material)
{
size_t slen;
- size_t erroff;
- int rc;
- unsigned char sdata_buf[2048]; /* big enough to print dh-shared-secret as
S-expression */
+ unsigned char sdata_buf[2048]; /* big enough to print
+ dh-shared-secret as
+ S-expression */
gcry_mpi_point_t result;
gcry_mpi_point_t q;
gcry_mpi_t d;
@@ -884,34 +865,19 @@
gcry_sexp_t ecdh_sexp;
gcry_mpi_t result_x;
gcry_mpi_t result_y;
+ int rc;
/* first, extract the q = dP value from the public key */
if (! (pub_sexpr = decode_public_key (pub)))
return GNUNET_SYSERR;
- if (0 != (rc = gcry_mpi_ec_new (&ctx, pub_sexpr, NULL)))
- {
- LOG_GCRY (GNUNET_ERROR_TYPE_ERROR, "gcry_mpi_ec_new", rc); /* erroff
gives more info */
- return GNUNET_SYSERR;
- }
+ GNUNET_assert (0 == gcry_mpi_ec_new (&ctx, pub_sexpr, NULL));
gcry_sexp_release (pub_sexpr);
q = gcry_mpi_ec_get_point ("q", ctx, 0);
- gcry_ctx_release (ctx);
/* second, extract the d value from our private key */
mpi_scan (&d, priv->d, sizeof (priv->d));
- /* create a new context for definitively the correct curve;
- theoretically the 'public_key' might not use the right curve */
- if (0 != (rc = gcry_mpi_ec_new (&ctx, NULL, CURVE)))
- {
- LOG_GCRY (GNUNET_ERROR_TYPE_ERROR, "gcry_mpi_ec_new", rc); /* erroff
gives more info */
- gcry_mpi_release (d);
- gcry_mpi_point_release (q);
- return GNUNET_SYSERR;
- }
-
/* then call the 'multiply' function, to compute the product */
- GNUNET_assert (NULL != ctx);
result = gcry_mpi_point_new (0);
gcry_mpi_ec_mul (result, d, q, ctx);
gcry_mpi_point_release (q);
@@ -929,12 +895,12 @@
}
gcry_mpi_point_release (result);
gcry_ctx_release (ctx);
- if (0 != (rc = gcry_sexp_build (&ecdh_sexp, &erroff,
+ if (0 != (rc = gcry_sexp_build (&ecdh_sexp, NULL,
"(dh-shared-secret (x %m)(y %m))",
result_x,
result_y)))
{
- LOG_GCRY (GNUNET_ERROR_TYPE_ERROR, "gcry_sexp_build", rc); /* erroff
gives more info */
+ LOG_GCRY (GNUNET_ERROR_TYPE_ERROR, "gcry_sexp_build", rc);
gcry_mpi_release (result_x);
gcry_mpi_release (result_y);
return GNUNET_SYSERR;
@@ -998,24 +964,17 @@
gcry_mpi_t x;
gcry_mpi_t d;
gcry_mpi_t n;
- int rc;
+ gcry_ctx_t ctx;
+ GNUNET_assert (0 == gcry_mpi_ec_new (&ctx, NULL, CURVE));
+ n = gcry_mpi_ec_get_mpi ("n", ctx, 0 /* no copy */);
GNUNET_CRYPTO_ecc_key_get_public (priv, &pub);
h = derive_h (&pub, label);
mpi_scan (&x, priv->d, sizeof (priv->d));
- /* initialize 'n' from P-256; hex copied from libgcrypt code */
- if (0 != (rc = gcry_mpi_scan (&n, GCRYMPI_FMT_HEX,
-
"0xffffffff00000000ffffffffffffffffbce6faada7179e84f3b9cac2fc632551", 0, NULL)))
- {
- LOG_GCRY (GNUNET_ERROR_TYPE_ERROR, "gcry_mpi_scan", rc);
- gcry_mpi_release (h);
- return NULL;
- }
d = gcry_mpi_new (256);
gcry_mpi_mulm (d, h, x, n);
gcry_mpi_release (h);
gcry_mpi_release (x);
- gcry_mpi_release (n);
ret = GNUNET_new (struct GNUNET_CRYPTO_EccPrivateKey);
mpi_print (ret->d, sizeof (ret->d), d);
gcry_mpi_release (d);
@@ -1036,36 +995,38 @@
const char *label,
struct GNUNET_CRYPTO_EccPublicKey *result)
{
+ gcry_ctx_t ctx;
gcry_mpi_t h;
- gcry_ctx_t ctx;
+ gcry_mpi_t n;
+ gcry_mpi_t h_mod_n;
gcry_mpi_t q_x;
gcry_mpi_t q_y;
gcry_mpi_point_t q;
gcry_mpi_point_t v;
- int rc;
- h = derive_h (pub, label);
+ GNUNET_assert (0 == gcry_mpi_ec_new (&ctx, NULL, CURVE));
+
+ /* obtain point 'q' from original public key */
mpi_scan (&q_x, pub->q_x, sizeof (pub->q_x));
mpi_scan (&q_y, pub->q_y, sizeof (pub->q_y));
- q = gcry_mpi_point_new (256);
+
+ q = gcry_mpi_point_new (0);
gcry_mpi_point_set (q, q_x, q_y, GCRYMPI_CONST_ONE);
gcry_mpi_release (q_x);
gcry_mpi_release (q_y);
- /* create basic ECC context */
- if (0 != (rc = gcry_mpi_ec_new (&ctx, NULL, CURVE)))
- {
- LOG_GCRY (GNUNET_ERROR_TYPE_ERROR, "gcry_mpi_ec_new", rc);
- gcry_mpi_point_release (q);
- gcry_mpi_release (h);
- return;
- }
- v = gcry_mpi_point_new (256);
- /* we could calculate 'h mod n' here first, but hopefully
- libgcrypt is smart enough to do that for us... */
- gcry_mpi_ec_mul (v, h, q, ctx);
+ /* calulcate h_mod_n = h % n */
+ h = derive_h (pub, label);
+ n = gcry_mpi_ec_get_mpi ("n", ctx, 0 /* no copy */);
+ h_mod_n = gcry_mpi_new (256);
+ gcry_mpi_mod (h_mod_n, h, n);
+ /* calculate v = h_mod_n * q */
+ v = gcry_mpi_point_new (0);
+ gcry_mpi_ec_mul (v, h_mod_n, q, ctx);
+ gcry_mpi_release (h_mod_n);
gcry_mpi_release (h);
gcry_mpi_point_release (q);
+ /* convert point 'v' to public key that we return */
point_to_public_key (v, ctx, result);
gcry_mpi_point_release (v);
gcry_ctx_release (ctx);
Modified: gnunet/src/util/test_crypto_ecc.c
===================================================================
--- gnunet/src/util/test_crypto_ecc.c 2013-08-07 21:26:46 UTC (rev 28441)
+++ gnunet/src/util/test_crypto_ecc.c 2013-08-07 21:27:39 UTC (rev 28442)
@@ -24,18 +24,17 @@
* @author Christian Grothoff
*/
#include "platform.h"
-#include "gnunet_common.h"
#include "gnunet_util_lib.h"
#include "gnunet_signatures.h"
#include <gcrypt.h>
-#define TESTSTRING "Hello World\0"
-#define MAX_TESTVAL sizeof(struct GNUNET_CRYPTO_AesSessionKey)
#define ITER 25
+
#define KEYFILE "/tmp/test-gnunet-crypto-ecc.key"
#define PERF GNUNET_YES
+
static struct GNUNET_CRYPTO_EccPrivateKey *key;
@@ -87,6 +86,60 @@
}
+static int
+testDeriveSignVerify ()
+{
+ struct GNUNET_CRYPTO_EccSignature sig;
+ struct GNUNET_CRYPTO_EccSignaturePurpose purp;
+ struct GNUNET_CRYPTO_EccPrivateKey *dpriv;
+ struct GNUNET_CRYPTO_EccPublicKey pkey;
+ struct GNUNET_CRYPTO_EccPublicKey dpub;
+
+ dpriv = GNUNET_CRYPTO_ecc_key_derive (key, "test-derive");
+ GNUNET_CRYPTO_ecc_key_get_public (key, &pkey);
+ GNUNET_CRYPTO_ecc_public_key_derive (&pkey, "test-derive", &dpub);
+ purp.size = htonl (sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose));
+ purp.purpose = htonl (GNUNET_SIGNATURE_PURPOSE_TEST);
+
+ if (GNUNET_SYSERR == GNUNET_CRYPTO_ecc_sign (dpriv, &purp, &sig))
+ {
+ FPRINTF (stderr, "%s", "GNUNET_CRYPTO_ecc_sign returned SYSERR\n");
+ GNUNET_CRYPTO_ecc_key_free (dpriv);
+ return GNUNET_SYSERR;
+ }
+ if (GNUNET_SYSERR ==
+ GNUNET_CRYPTO_ecc_verify (GNUNET_SIGNATURE_PURPOSE_TEST,
+ &purp, &sig,
+ &dpub))
+ {
+ printf ("GNUNET_CRYPTO_ecc_verify failed!\n");
+ GNUNET_CRYPTO_ecc_key_free (dpriv);
+ return GNUNET_SYSERR;
+ }
+ if (GNUNET_SYSERR !=
+ GNUNET_CRYPTO_ecc_verify (GNUNET_SIGNATURE_PURPOSE_TEST,
+ &purp, &sig,
+ &pkey))
+ {
+ printf ("GNUNET_CRYPTO_ecc_verify failed to fail!\n");
+ GNUNET_CRYPTO_ecc_key_free (dpriv);
+ return GNUNET_SYSERR;
+ }
+ if (GNUNET_SYSERR !=
+ GNUNET_CRYPTO_ecc_verify (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_PONG_OWN,
+ &purp, &sig, &dpub))
+ {
+ printf ("GNUNET_CRYPTO_ecc_verify failed to fail!\n");
+ GNUNET_CRYPTO_ecc_key_free (dpriv);
+ return GNUNET_SYSERR;
+ }
+ GNUNET_CRYPTO_ecc_key_free (dpriv);
+ return GNUNET_OK;
+}
+
+
+
+
#if PERF
static int
testSignPerformance ()
@@ -141,6 +194,7 @@
GNUNET_assert (NULL != key);
GNUNET_CRYPTO_ecc_key_get_public (key, &p2);
GNUNET_assert (0 != memcmp (&p1, &p2, sizeof (p1)));
+ GNUNET_CRYPTO_ecc_key_free (key);
return GNUNET_OK;
}
@@ -191,9 +245,9 @@
int
main (int argc, char *argv[])
{
- int failureCount = 0;
+ int failure_count = 0;
- if (!gcry_check_version ("1.5.0"))
+ if (! gcry_check_version ("1.5.0"))
{
FPRINTF (stderr,
_
@@ -202,22 +256,32 @@
return 0;
}
GNUNET_log_setup ("test-crypto-ecc", "WARNING", NULL);
- if (GNUNET_OK != testCreateFromFile ())
- failureCount++;
+ key = GNUNET_CRYPTO_ecc_key_create ();
+ if (GNUNET_OK != testDeriveSignVerify ())
+ {
+ failure_count++;
+ fprintf (stderr,
+ "\n\n%d TESTS FAILED!\n\n", failure_count);
+ return -1;
+ }
#if PERF
if (GNUNET_OK != testSignPerformance ())
- failureCount++;
+ failure_count++;
#endif
if (GNUNET_OK != testSignVerify ())
- failureCount++;
+ failure_count++;
GNUNET_CRYPTO_ecc_key_free (key);
+ if (GNUNET_OK != testCreateFromFile ())
+ failure_count++;
GNUNET_assert (0 == UNLINK (KEYFILE));
test_ecdh ();
perf_keygen ();
- if (failureCount != 0)
+ if (0 != failure_count)
{
- printf ("\n\n%d TESTS FAILED!\n\n", failureCount);
+ fprintf (stderr,
+ "\n\n%d TESTS FAILED!\n\n",
+ failure_count);
return -1;
}
return 0;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r28442 - gnunet/src/util,
gnunet <=