From 3099a7c25cf6b11b0f1909e5a2651d65c0e921c7 Mon Sep 17 00:00:00 2001
From: Andreas Ebner <a.e.bner@web.de>
Date: Fri, 20 Sep 2019 10:49:02 +0200
Subject: Cleanup TODOs, bugfix in cleanup and start of bidirectional chain
 resolution: - removed and/or implemented all remaining TODOs - fixed a bug in
 cleanup_handle() which caused to not cleanup correctly when a solution was
 prematurely found - delegation_chain_bw/fw_resolution_start() not has a
 return value to indicate whether a solution was prematurely found - cleaned
 up the test_... files (an additional cleanup commit might follow)

---
 src/credential/test_credential_own.sh | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'src/credential/test_credential_own.sh')

diff --git a/src/credential/test_credential_own.sh b/src/credential/test_credential_own.sh
index fa2580a22..b868cdf67 100755
--- a/src/credential/test_credential_own.sh
+++ b/src/credential/test_credential_own.sh
@@ -15,10 +15,6 @@ fi
 
 rm -rf `gnunet-config -c test_credential_lookup.conf -s PATHS -o GNUNET_HOME -f`
 
-#   (1) EPub.discount <- EOrg.preferred
-#   (2) EOrg.preferred <- StateU.student
-#   (3) StateU.student <- RegistrarB.student
-#   (4) RegistrarB.student <- Alice
 
 
 which timeout > /dev/null 2>&1 && DO_TIMEOUT="timeout 10"
@@ -35,6 +31,12 @@ EKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep e | awk '{print
 FKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep f | awk '{print $3}')
 GKEY=$(gnunet-identity -d -c test_credential_lookup.conf | grep g | awk '{print $3}')
 
+############################################################################################
+#   (1) EPub.discount <- EOrg.preferred
+#   (2) EOrg.preferred <- StateU.student
+#   (3) StateU.student <- RegistrarB.student
+#   (4) RegistrarB.student <- Alice
+
 gnunet-identity -C epub -c test_credential_lookup.conf
 gnunet-identity -C eorg -c test_credential_lookup.conf
 gnunet-identity -C stateu -c test_credential_lookup.conf
@@ -54,7 +56,7 @@ STATE_STUD_ATTR="student"
 REG_STUD_ATTR="student"
 END_ATTR="end"
 
-# FORWARD, subject side stored
+# FORWARD, subject side stored (different constallations)
 SIGNED=`$DO_TIMEOUT gnunet-credential --signSubjectSide --ego=a --attribute="a" --subject="$AKEY b.c" --ttl="2019-12-12 10:00:00"`
 gnunet-credential --createSubjectSide --ego=a --import "$SIGNED"
 gnunet-namestore -D -z a
@@ -99,11 +101,13 @@ gnunet-credential --createSubjectSide --ego=alice --import "$SIGNED" --private
 # Starting to resolve
 echo "+++ Starting to Resolve +++"
 
+# FORWARD
 #DELS=`$DO_TIMEOUT gnunet-credential --collect --issuer=$AKEY --attribute="a" --ego=g --forward -c test_credential_lookup.conf | paste -d, -s`
 #echo $DELS
 #echo gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$GKEY --delegate=\'$DELS\' --forward -c test_credential_lookup.conf
 #RES_DELS=`gnunet-credential --verify --issuer=$AKEY --attribute="a" --subject=$GKEY --delegate="$DELS" --forward -c test_credential_lookup.conf`
 
+# BACKWARD
 DELS=`$DO_TIMEOUT gnunet-credential --collect --issuer=$EPUB_KEY --attribute=$DISC_ATTR --ego=alice --backward -c test_credential_lookup.conf | paste -d, -s`
 echo $DELS
 echo gnunet-credential --verify --issuer=$EPUB_KEY --attribute=$DISC_ATTR --subject=$ALICE_KEY --delegate=\'$DELS\' --backward -c test_credential_lookup.conf
@@ -115,15 +119,16 @@ RES=$?
 gnunet-namestore -z epub -d -n $DISC_ATTR -t ATTR -c test_credential_lookup.conf
 gnunet-namestore -z eorg -d -n $PREF_ATTR -t ATTR -c test_credential_lookup.conf
 gnunet-namestore -z stateu -d -n $STATE_STUD_ATTR -t ATTR -c test_credential_lookup.conf
-#gnunet-namestore -z a -d -n $STATE_STUD_ATTR -t ATTR -c test_credential_lookup.conf
-#gnunet-namestore -z d -d -n $STATE_STUD_ATTR -t ATTR -c test_credential_lookup.conf
-#gnunet-namestore -z e -d -n $STATE_STUD_ATTR -t ATTR -c test_credential_lookup.conf
-#gnunet-namestore -z f -d -n $STATE_STUD_ATTR -t ATTR -c test_credential_lookup.conf
-#gnunet-namestore -z g -d -n $STATE_STUD_ATTR -t ATTR -c test_credential_lookup.conf
+#gnunet-namestore -z a -d -n "@" -t DEL -c test_credential_lookup.conf
+#gnunet-namestore -z d -d -n "@" -t DEL -c test_credential_lookup.conf
+#gnunet-namestore -z e -d -n "@" -t DEL -c test_credential_lookup.conf
+#gnunet-namestore -z f -d -n "@" -t DEL -c test_credential_lookup.conf
+#gnunet-namestore -z g -d -n "@" -t DEL -c test_credential_lookup.conf
+
 
 gnunet-arm -e -c test_credential_lookup.conf
 
-if [ $RES == 0 ]
+if [ "$RES" == 0 ]
 then
   exit 0
 else
-- 
cgit v1.2.3