3 files changed, 19 insertions, 19 deletions

diff --git a/src/include/gnunet_crypto_lib.h b/src/include/gnunet_crypto_lib.h
index c2176f3f2..72d783148 100644
--- a/src/include/gnunet_crypto_lib.h
+++ b/src/include/gnunet_crypto_lib.h
@@ -307,7 +307,7 @@ struct GNUNET_CRYPTO_SymmetricSessionKey
 /**
  * Type of a nonce used for challenges.
  */
-struct ChallengeNonceP
+struct GNUNET_CRYPTO_ChallengeNonceP
 {
   /**
    * The value of the nonce.  Note that this is NOT a hash.
diff --git a/src/transport/gnunet-communicator-tcp.c b/src/transport/gnunet-communicator-tcp.c
index 3bfdeaa90..be75fa0e8 100644
--- a/src/transport/gnunet-communicator-tcp.c
+++ b/src/transport/gnunet-communicator-tcp.c
@@ -143,7 +143,7 @@ struct TcpHandshakeSignature
   /**
    * Challenge value used to protect against replay attack, if there is no stored monotonic time value.
    */
-  struct ChallengeNonceP challenge;
+  struct GNUNET_CRYPTO_ChallengeNonceP challenge;
 };
 
 /**
@@ -176,7 +176,7 @@ struct TcpHandshakeAckSignature
   /**
    * Challenge value used to protect against replay attack, if there is no stored monotonic time value.
    */
-  struct ChallengeNonceP challenge;
+  struct GNUNET_CRYPTO_ChallengeNonceP challenge;
 };
 
 /**
@@ -203,7 +203,7 @@ struct TCPConfirmation
   /**
    * Challenge value used to protect against replay attack, if there is no stored monotonic time value.
    */
-  struct ChallengeNonceP challenge;
+  struct GNUNET_CRYPTO_ChallengeNonceP challenge;
 
 };
 
@@ -238,7 +238,7 @@ struct TCPConfirmationAck
   /**
    * Challenge value used to protect against replay attack, if there is no stored monotonic time value.
    */
-  struct ChallengeNonceP challenge;
+  struct GNUNET_CRYPTO_ChallengeNonceP challenge;
 
 };
 
@@ -587,12 +587,12 @@ struct Queue
   /**
    * Challenge value used to protect against replay attack, if there is no stored monotonic time value.
    */
-  struct ChallengeNonceP challenge;
+  struct GNUNET_CRYPTO_ChallengeNonceP challenge;
 
   /**
    * Challenge value received. In case of inbound connection we have to remember the value, because we send the challenge back later after we received the GNUNET_MESSAGE_TYPE_COMMUNICATOR_TCP_CONFIRMATION_ACK.
    */
-  struct ChallengeNonceP challenge_received;
+  struct GNUNET_CRYPTO_ChallengeNonceP challenge_received;
 
   /**
    * Iteration Context for retrieving the monotonic time send with key for rekeying.
@@ -1447,7 +1447,7 @@ handshake_ack_monotime_cb (void *cls,
  * @param queue The queue context.
  */
 static void
-send_challenge (struct ChallengeNonceP challenge, struct Queue *queue)
+send_challenge (struct GNUNET_CRYPTO_ChallengeNonceP challenge, struct Queue *queue)
 {
   struct TCPConfirmationAck tca;
   struct TcpHandshakeAckSignature thas;
@@ -1680,7 +1680,7 @@ try_handle_plaintext (struct Queue *queue)
   uint16_t type;
   size_t size = 0; /* make compiler happy */
   struct TcpHandshakeAckSignature thas;
-  const struct ChallengeNonceP challenge = queue->challenge;
+  const struct GNUNET_CRYPTO_ChallengeNonceP challenge = queue->challenge;
 
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "try handle plaintext!\n");
diff --git a/src/transport/gnunet-service-tng.c b/src/transport/gnunet-service-tng.c
index 56a854a70..778679ed4 100644
--- a/src/transport/gnunet-service-tng.c
+++ b/src/transport/gnunet-service-tng.c
@@ -570,7 +570,7 @@ struct DvInitPS
   /**
    * Challenge value used by the initiator to re-identify the path.
    */
-  struct ChallengeNonceP challenge;
+  struct GNUNET_CRYPTO_ChallengeNonceP challenge;
 };
 
 
@@ -610,7 +610,7 @@ struct DvHopPS
   /**
    * Challenge value used by the initiator to re-identify the path.
    */
-  struct ChallengeNonceP challenge;
+  struct GNUNET_CRYPTO_ChallengeNonceP challenge;
 };
 
 
@@ -704,7 +704,7 @@ struct TransportDVLearnMessage
   /**
    * Challenge value used by the initiator to re-identify the path.
    */
-  struct ChallengeNonceP challenge;
+  struct GNUNET_CRYPTO_ChallengeNonceP challenge;
 
   /* Followed by @e num_hops `struct DVPathEntryP` values,
      excluding the initiator of the DV trace; the last entry is the
@@ -813,7 +813,7 @@ struct TransportValidationChallengeMessage
   /**
    * Challenge to be signed by the receiving peer.
    */
-  struct ChallengeNonceP challenge;
+  struct GNUNET_CRYPTO_ChallengeNonceP challenge;
 
   /**
    * Timestamp of the sender, to be copied into the reply to allow
@@ -843,7 +843,7 @@ struct TransportValidationPS
   /**
    * Challenge signed by the receiving peer.
    */
-  struct ChallengeNonceP challenge;
+  struct GNUNET_CRYPTO_ChallengeNonceP challenge;
 };
 
 
@@ -872,7 +872,7 @@ struct TransportValidationResponseMessage
   /**
    * The challenge that was signed by the receiving peer.
    */
-  struct ChallengeNonceP challenge;
+  struct GNUNET_CRYPTO_ChallengeNonceP challenge;
 
   /**
    * Original timestamp of the sender (was @code{sender_time}),
@@ -1035,7 +1035,7 @@ struct LearnLaunchEntry
   /**
    * Challenge that uniquely identifies this activity.
    */
-  struct ChallengeNonceP challenge;
+  struct GNUNET_CRYPTO_ChallengeNonceP challenge;
 
   /**
    * When did we transmit the DV learn message (used to calculate RTT) and
@@ -2537,7 +2537,7 @@ struct ValidationState
    * (We must not rotate more often as otherwise we may discard valid answers
    * due to packet losses, latency and reorderings on the network).
    */
-  struct ChallengeNonceP challenge;
+  struct GNUNET_CRYPTO_ChallengeNonceP challenge;
 
   /**
    * Claimed address of the peer.
@@ -6712,7 +6712,7 @@ static int
 validate_dv_initiator_signature (
   struct GNUNET_TIME_AbsoluteNBO sender_monotonic_time,
   const struct GNUNET_PeerIdentity *init,
-  const struct ChallengeNonceP *challenge,
+  const struct GNUNET_CRYPTO_ChallengeNonceP *challenge,
   const struct GNUNET_CRYPTO_EddsaSignature *init_sig)
 {
   struct DvInitPS ip = { .purpose.purpose = htonl (
@@ -8172,7 +8172,7 @@ struct CheckKnownChallengeContext
   /**
    * Set to the challenge we are looking for.
    */
-  const struct ChallengeNonceP *challenge;
+  const struct GNUNET_CRYPTO_ChallengeNonceP *challenge;
 
   /**
    * Set to a matching validation state, if one was found.