[GNUnet-SVN] [gnunet] 18/171: Merge branch 'credentials' of git+ssh://gnunet.org/gnunet into credentials

[gnunet]

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

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

commit 191fd80caf3288ff2a620541f4aa623647b589fa
Merge: 6fb6ddb3c 113150fb9
Author: Adnan H <address@hidden>
AuthorDate: Fri Dec 2 15:38:33 2016 +0100

    Merge branch 'credentials' of git+ssh://gnunet.org/gnunet into credentials

 configure.ac                                     |   2 +-
 doc/man/Makefile.am                              |   1 +
 doc/man/gnunet-nat.1                             |  66 +++
 guix-env.scm                                     |   6 +-
 po/de.po                                         |  98 ++--
 po/es.po                                         | 102 ++--
 po/fr.po                                         |  92 ++--
 po/sv.po                                         | 102 ++--
 po/vi.po                                         | 102 ++--
 po/zh_CN.po                                      | 102 ++--
 src/conversation/plugin_gnsrecord_conversation.c |   4 +-
 src/credential/gnunet-service-credential.c       |  11 +
 src/credential/plugin_gnsrecord_credential.c     |  28 +-
 src/exit/gnunet-daemon-exit.c                    |   2 +-
 src/gns/gnunet-dns2gns.c                         |  11 +-
 src/include/gnunet_credential_service.h          |  29 +-
 src/include/gnunet_nat_service.h                 | 127 +++--
 src/include/gnunet_network_lib.h                 |   2 +-
 src/include/gnunet_protocols.h                   |  10 -
 src/include/gnunet_signatures.h                  |   5 +
 src/include/gnunet_strings_lib.h                 |  25 +-
 src/nat/Makefile.am                              |  11 +-
 src/nat/gnunet-nat.c                             | 581 ++++++++++++++++++--
 src/nat/gnunet-service-nat.c                     | 509 ++++++++++++++++--
 src/nat/gnunet-service-nat_helper.c              | 410 +++++++++++++++
 src/nat/gnunet-service-nat_helper.h              |  89 ++++
 src/nat/gnunet-service-nat_stun.c                | 211 ++++++++
 src/nat/gnunet-service-nat_stun.h                |  61 +++
 src/nat/nat.conf                                 |   3 +
 src/nat/nat.h                                    |  55 --
 src/nat/nat_api.c                                | 152 +-----
 src/nat/nat_api_stun.c                           | 262 +++++++++
 src/nat/nat_api_test.c                           | 644 +++++++++++++++++++++++
 src/nat/nat_stun.c                               | 126 -----
 src/nat/nat_stun.h                               | 170 +++++-
 src/postgres/postgres.c                          |   3 +-
 src/util/network.c                               |   8 +-
 src/util/service_new.c                           |   8 +
 src/util/strings.c                               |  78 ++-
 39 files changed, 3504 insertions(+), 804 deletions(-)

diff --cc src/credential/gnunet-service-credential.c
index 620256cd9,3ad2e2e1d..ed7d249e3
--- a/src/credential/gnunet-service-credential.c
+++ b/src/credential/gnunet-service-credential.c
@@@ -288,33 -249,29 +288,44 @@@ send_lookup_response (void* cls
       *  Save all found attributes/issues and prepare forward
       *  resolution of issuer attribute
       */
 -    ar_entry = GNUNET_new (struct AttributeRecordEntry);
 -    ar_entry->record_data = *ard;
 -    GNUNET_CONTAINER_DLL_insert_tail (vrh->attr_chain_head,
 -                                      vrh->attr_chain_tail,
 -                                      ar_entry);
 +    cr_entry = GNUNET_new (struct CredentialRecordEntry);
 +    cr_entry->record_data = *crd;
 +    GNUNET_CONTAINER_DLL_insert_tail (vrh->cred_chain_head,
 +                                      vrh->cred_chain_tail,
 +                                      cr_entry);
 +
 +    if(GNUNET_CRYPTO_ecdsa_verify(GNUNET_SIGNATURE_PURPOSE_CREDENTIAL, 
purpose, sig, issuer_key))
 +    {   
 +      cred_verified = true;
 +      break;
 +    }
  
    }
 +  
 +
 +  /**
 +   * Check for attributes from the issuer and follow the chain 
 +   * till you get the required subject's attributes
 +   */
 +  if(cred_verified != true){
 +    for(i=0 ; i < rd_count ; i++){
 +
  
    /**
+    * TODO
+    * Start resolution of Attribute delegations from issuer
+    *
+    * - Build adequate data structures for attribute(s) to lookup
+    * - Use GNUNET_GNSRECORD_TYPE_XXX
+    * - recursively try to find match(es) with results found top
+    * - return one found credential chain
+    *
+    */
+ 
+   /**
     * Get serialized record data size
     */
 -  len = attr_record_count * sizeof (struct 
GNUNET_CREDENTIAL_AttributeRecordData);
 +  len = cred_record_count * sizeof (struct 
GNUNET_CREDENTIAL_CredentialRecordData);
  
    /**
     * Prepare a lookup result response message for the client

-- 
To stop receiving notification emails like this one, please contact
address@hidden