diff options
author | Christian Grothoff <christian@grothoff.org> | 2020-04-11 21:43:28 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2020-04-11 21:43:34 +0200 |
commit | 90ff9edfa9c5fcfa3a36d1653ff105e89b888e21 (patch) | |
tree | 780a2071f5072c8e8e044db741eb295c3f3ea2a7 /src/util/test_crypto_ecdh_ecdsa.c | |
parent | 3bcfe59f1ce533246bda271f00b3ee957cae304d (diff) | |
download | gnunet-90ff9edfa9c5fcfa3a36d1653ff105e89b888e21.tar.gz gnunet-90ff9edfa9c5fcfa3a36d1653ff105e89b888e21.zip |
fixing #6149
Diffstat (limited to 'src/util/test_crypto_ecdh_ecdsa.c')
-rw-r--r-- | src/util/test_crypto_ecdh_ecdsa.c | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/util/test_crypto_ecdh_ecdsa.c b/src/util/test_crypto_ecdh_ecdsa.c index 8a581ef73..3cc12de9b 100644 --- a/src/util/test_crypto_ecdh_ecdsa.c +++ b/src/util/test_crypto_ecdh_ecdsa.c | |||
@@ -32,39 +32,37 @@ | |||
32 | static int | 32 | static int |
33 | test_ecdh () | 33 | test_ecdh () |
34 | { | 34 | { |
35 | struct GNUNET_CRYPTO_EcdsaPrivateKey *priv_dsa; | 35 | struct GNUNET_CRYPTO_EcdsaPrivateKey priv_dsa; |
36 | struct GNUNET_CRYPTO_EcdhePrivateKey *priv_ecdh; | 36 | struct GNUNET_CRYPTO_EcdhePrivateKey priv_ecdh; |
37 | struct GNUNET_CRYPTO_EcdsaPublicKey id1; | 37 | struct GNUNET_CRYPTO_EcdsaPublicKey id1; |
38 | struct GNUNET_CRYPTO_EcdhePublicKey id2; | 38 | struct GNUNET_CRYPTO_EcdhePublicKey id2; |
39 | struct GNUNET_HashCode dh[2]; | 39 | struct GNUNET_HashCode dh[2]; |
40 | 40 | ||
41 | /* Generate keys */ | 41 | /* Generate keys */ |
42 | priv_dsa = GNUNET_CRYPTO_ecdsa_key_create (); | 42 | GNUNET_CRYPTO_ecdsa_key_create (&priv_dsa); |
43 | GNUNET_CRYPTO_ecdsa_key_get_public (priv_dsa, | 43 | GNUNET_CRYPTO_ecdsa_key_get_public (&priv_dsa, |
44 | &id1); | 44 | &id1); |
45 | for (unsigned int j = 0; j < 4; j++) | 45 | for (unsigned int j = 0; j < 4; j++) |
46 | { | 46 | { |
47 | fprintf (stderr, ","); | 47 | fprintf (stderr, ","); |
48 | priv_ecdh = GNUNET_CRYPTO_ecdhe_key_create (); | 48 | GNUNET_CRYPTO_ecdhe_key_create (&priv_ecdh); |
49 | /* Extract public keys */ | 49 | /* Extract public keys */ |
50 | GNUNET_CRYPTO_ecdhe_key_get_public (priv_ecdh, | 50 | GNUNET_CRYPTO_ecdhe_key_get_public (&priv_ecdh, |
51 | &id2); | 51 | &id2); |
52 | /* Do ECDH */ | 52 | /* Do ECDH */ |
53 | GNUNET_assert (GNUNET_OK == | 53 | GNUNET_assert (GNUNET_OK == |
54 | GNUNET_CRYPTO_ecdsa_ecdh (priv_dsa, | 54 | GNUNET_CRYPTO_ecdsa_ecdh (&priv_dsa, |
55 | &id2, | 55 | &id2, |
56 | &dh[0])); | 56 | &dh[0])); |
57 | GNUNET_assert (GNUNET_OK == | 57 | GNUNET_assert (GNUNET_OK == |
58 | GNUNET_CRYPTO_ecdh_ecdsa (priv_ecdh, | 58 | GNUNET_CRYPTO_ecdh_ecdsa (&priv_ecdh, |
59 | &id1, | 59 | &id1, |
60 | &dh[1])); | 60 | &dh[1])); |
61 | /* Check that both DH results are equal. */ | 61 | /* Check that both DH results are equal. */ |
62 | GNUNET_assert (0 == memcmp (&dh[0], | 62 | GNUNET_assert (0 == |
63 | &dh[1], | 63 | GNUNET_memcmp (&dh[0], |
64 | sizeof(struct GNUNET_HashCode))); | 64 | &dh[1])); |
65 | GNUNET_free (priv_ecdh); | ||
66 | } | 65 | } |
67 | GNUNET_free (priv_dsa); | ||
68 | return 0; | 66 | return 0; |
69 | } | 67 | } |
70 | 68 | ||
@@ -75,8 +73,7 @@ main (int argc, char *argv[]) | |||
75 | if (! gcry_check_version ("1.6.0")) | 73 | if (! gcry_check_version ("1.6.0")) |
76 | { | 74 | { |
77 | fprintf (stderr, | 75 | fprintf (stderr, |
78 | _ ( | 76 | "libgcrypt has not the expected version (version %s is required).\n", |
79 | "libgcrypt has not the expected version (version %s is required).\n"), | ||
80 | "1.6.0"); | 77 | "1.6.0"); |
81 | return 0; | 78 | return 0; |
82 | } | 79 | } |