[taler-donau] branch master updated (aedec9e -> 4865637)

[gnunet]

This is an automated email from the git hooks/post-receive script.

lukas-matyja pushed a change to branch master
in repository donau.

    from aedec9e  remove array support
     new 49393f5  [testing] remove donau offline part from unified setup script
     new 4865637  solve merge conflict

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/donau/donau-httpd_keys.c       | 37 ++++++-------------------------------
 src/testing/donau-unified-setup.sh |  2 +-
 2 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/src/donau/donau-httpd_keys.c b/src/donau/donau-httpd_keys.c
index cdd62a4..c2f04f7 100644
--- a/src/donau/donau-httpd_keys.c
+++ b/src/donau/donau-httpd_keys.c
@@ -48,16 +48,19 @@
 struct HelperDenomination
 {
 
+  // maybe change to year unsigned int later -> many associated changes
   /**
    * When will the helper start to use this key for signing?
    */
-  // struct GNUNET_TIME_Timestamp start_time;
+  struct GNUNET_TIME_Timestamp start_time;
+
 
   /**
    * For how long will the helper allow signing? 0 if
    * the key was revoked or purged.
    */
-  // struct GNUNET_TIME_Relative validity_duration;
+  struct GNUNET_TIME_Relative validity_duration;
+
 
   /**
    * Hash of the full denomination key.
@@ -101,34 +104,6 @@ struct HelperDenomination
 };
 
 
-/**
- * Signatures of an auditor over a denomination key of this donau.
- */
-// struct DH_AuditorSignature
-// {
-//   /**
-//    * We store the signatures in a DLL.
-//    */
-//   struct DH_AuditorSignature *prev;
-
-//   /**
-//    * We store the signatures in a DLL.
-//    */
-//   struct DH_AuditorSignature *next;
-
-//   /**
-//    * A signature from the auditor.
-//    */
-//   struct TALER_AuditorSignatureP asig;
-
-//   /**
-//    * Public key of the auditor.
-//    */
-//   struct TALER_AuditorPublicKeyP apub;
-
-// };
-
-
 /**
  * Information about a signing key on offer by the esign helper.
  */
@@ -201,7 +176,7 @@ struct HelperState
    * entries.  Based on the fact that a `struct GNUNET_PeerIdentity` is also
    * an EdDSA public key.
    */
-  struct GNUNET_CONTAINER_MultiPeerMap *esign_keys;
+  struct GNUNET_CONTAINER_MultiPeerMap *esign_keys; //abuse fall hash für 
public keys, key integer, key hash, key public key
 
 };
 
diff --git a/src/testing/donau-unified-setup.sh 
b/src/testing/donau-unified-setup.sh
index 831bd84..cf95f0e 100755
--- a/src/testing/donau-unified-setup.sh
+++ b/src/testing/donau-unified-setup.sh
@@ -470,7 +470,7 @@ then
     else
         DONAU_URL="http://localhost:${DONAU_PORT}/";
     fi
-    taler-donau-dbinit -c "$CONF" --reset
+    donau-dbinit -c "$CONF" --reset
     $USE_VALGRIND donau-secmod-eddsa -c "$CONF" -L "$LOGLEVEL" 2> 
donau-secmod-eddsa.log &
     $USE_VALGRIND donau-secmod-rsa -c "$CONF" -L "$LOGLEVEL" 2> 
donau-secmod-rsa.log &
     $USE_VALGRIND donau-secmod-cs -c "$CONF" -L "$LOGLEVEL" 2> 
donau-secmod-cs.log &

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.