diff options
Diffstat (limited to 'src/core/gnunet-service-core_kx.c')
-rw-r--r-- | src/core/gnunet-service-core_kx.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c index 14b509e8f..09f92f224 100644 --- a/src/core/gnunet-service-core_kx.c +++ b/src/core/gnunet-service-core_kx.c | |||
@@ -111,12 +111,12 @@ struct EphemeralKeyMessage | |||
111 | * Ephemeral public ECC key (always for NIST P-521) encoded in a format suitable | 111 | * Ephemeral public ECC key (always for NIST P-521) encoded in a format suitable |
112 | * for network transmission as created using 'gcry_sexp_sprint'. | 112 | * for network transmission as created using 'gcry_sexp_sprint'. |
113 | */ | 113 | */ |
114 | struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded ephemeral_key; | 114 | struct GNUNET_CRYPTO_EccPublicKey ephemeral_key; |
115 | 115 | ||
116 | /** | 116 | /** |
117 | * Public key of the signing peer (persistent version, not the ephemeral public key). | 117 | * Public key of the signing peer (persistent version, not the ephemeral public key). |
118 | */ | 118 | */ |
119 | struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded origin_public_key; | 119 | struct GNUNET_CRYPTO_EccPublicKey origin_public_key; |
120 | 120 | ||
121 | }; | 121 | }; |
122 | 122 | ||
@@ -392,7 +392,7 @@ static struct EphemeralKeyMessage current_ekm; | |||
392 | /** | 392 | /** |
393 | * Our public key. | 393 | * Our public key. |
394 | */ | 394 | */ |
395 | static struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded my_public_key; | 395 | static struct GNUNET_CRYPTO_EccPublicKey my_public_key; |
396 | 396 | ||
397 | /** | 397 | /** |
398 | * Our message stream tokenizer (for encrypted payload). | 398 | * Our message stream tokenizer (for encrypted payload). |
@@ -771,7 +771,7 @@ GSC_KX_handle_ephemeral_key (struct GSC_KeyExchangeInfo *kx, | |||
771 | "Core service receives `%s' request from `%4s'.\n", "EPHEMERAL_KEY", | 771 | "Core service receives `%s' request from `%4s'.\n", "EPHEMERAL_KEY", |
772 | GNUNET_i2s (&kx->peer)); | 772 | GNUNET_i2s (&kx->peer)); |
773 | GNUNET_CRYPTO_hash (&m->origin_public_key, | 773 | GNUNET_CRYPTO_hash (&m->origin_public_key, |
774 | sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded), | 774 | sizeof (struct GNUNET_CRYPTO_EccPublicKey), |
775 | &signer_id.hashPubKey); | 775 | &signer_id.hashPubKey); |
776 | if (0 != | 776 | if (0 != |
777 | memcmp (&signer_id, &kx->peer, | 777 | memcmp (&signer_id, &kx->peer, |
@@ -784,8 +784,8 @@ GSC_KX_handle_ephemeral_key (struct GSC_KeyExchangeInfo *kx, | |||
784 | sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) + | 784 | sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) + |
785 | sizeof (struct GNUNET_TIME_AbsoluteNBO) + | 785 | sizeof (struct GNUNET_TIME_AbsoluteNBO) + |
786 | sizeof (struct GNUNET_TIME_AbsoluteNBO) + | 786 | sizeof (struct GNUNET_TIME_AbsoluteNBO) + |
787 | sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded) + | 787 | sizeof (struct GNUNET_CRYPTO_EccPublicKey) + |
788 | sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded)) || | 788 | sizeof (struct GNUNET_CRYPTO_EccPublicKey)) || |
789 | (GNUNET_OK != | 789 | (GNUNET_OK != |
790 | GNUNET_CRYPTO_ecc_verify (GNUNET_SIGNATURE_PURPOSE_SET_ECC_KEY, | 790 | GNUNET_CRYPTO_ecc_verify (GNUNET_SIGNATURE_PURPOSE_SET_ECC_KEY, |
791 | &m->purpose, | 791 | &m->purpose, |
@@ -1476,8 +1476,8 @@ sign_ephemeral_key () | |||
1476 | current_ekm.purpose.size = htonl (sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) + | 1476 | current_ekm.purpose.size = htonl (sizeof (struct GNUNET_CRYPTO_EccSignaturePurpose) + |
1477 | sizeof (struct GNUNET_TIME_AbsoluteNBO) + | 1477 | sizeof (struct GNUNET_TIME_AbsoluteNBO) + |
1478 | sizeof (struct GNUNET_TIME_AbsoluteNBO) + | 1478 | sizeof (struct GNUNET_TIME_AbsoluteNBO) + |
1479 | sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded) + | 1479 | sizeof (struct GNUNET_CRYPTO_EccPublicKey) + |
1480 | sizeof (struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded)); | 1480 | sizeof (struct GNUNET_CRYPTO_EccPublicKey)); |
1481 | current_ekm.creation_time = GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ()); | 1481 | current_ekm.creation_time = GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_get ()); |
1482 | if (GNUNET_YES == | 1482 | if (GNUNET_YES == |
1483 | GNUNET_CONFIGURATION_get_value_yesno (GSC_cfg, | 1483 | GNUNET_CONFIGURATION_get_value_yesno (GSC_cfg, |